remove val.Def()

Author: ilya-nurullin

modules/setting/config/value.go

@@ -28,7 +28,7 @@ type Value[T any] struct {
 
 func (value *Value[T]) parse(key, valStr string) (v T) {
 	v = value.def
-	if valStr != "" {
+	if valStr != "" && valStr != "null" {
 		if err := json.Unmarshal(util.UnsafeStringToBytes(valStr), &v); err != nil {
 			log.Error("Unable to unmarshal json config for key %q, err: %v", key, err)
 		}
@@ -79,10 +79,6 @@ func (value *Value[T]) DynKey() string {
 	return value.dynKey
 }
 
-func (value *Value[T]) Def() T {
-	return value.def
-}
-
 func (value *Value[T]) WithDefault(def T) *Value[T] {
 	value.def = def
 	return value

routers/web/admin/config.go

@@ -207,19 +207,18 @@ func ChangeConfig(ctx *context.Context) {
 		return "false", nil
 	}
 
-	marshalStringWithDefault := func(def string) func(v string) (string, error) {
-		return func(v string) (string, error) {
-			if strings.TrimSpace(v) == "" {
-				v = def
-			}
-			b, err := json.Marshal(v)
-			if err != nil {
-				return "", err
-			}
-			return string(b), nil
+	marshalString :=  func(v string) (string, error) {
+		if strings.TrimSpace(v) == "" {
+			return "null", nil
 		}
+		b, err := json.Marshal(v)
+		if err != nil {
+			return "", err
+		}
+		return string(b), nil
 	}
 
+
 	marshalOpenWithApps := func(value string) (string, error) {
 		lines := strings.Split(value, "\n")
 		var openWithEditorApps setting.OpenWithEditorAppsType
@@ -248,7 +247,7 @@ func ChangeConfig(ctx *context.Context) {
 		cfg.Picture.DisableGravatar.DynKey():       marshalBool,
 		cfg.Picture.EnableFederatedAvatar.DynKey(): marshalBool,
 		cfg.Repository.OpenWithEditorApps.DynKey(): marshalOpenWithApps,
-		cfg.Template.GitRemoteName.DynKey():        marshalStringWithDefault(cfg.Template.GitRemoteName.Def()),
+		cfg.Template.GitRemoteName.DynKey():        marshalString,
 	}
 	marshaller, hasMarshaller := marshallers[key]
 	if !hasMarshaller {

templates/admin/config_settings.tmpl

@@ -47,7 +47,7 @@
 	<form class="ui form form-fetch-action" method="post" action="{{AppSubUrl}}/-/admin/config?key={{.SystemConfig.Template.GitRemoteName.DynKey}}">
 		<div class="field" data-field-patched="true">
 			<label for="remote_name">{{ctx.Locale.Tr "admin.config.empty_repo_page.git_remote_name"}}</label>
-			<input id="remote_name" name="value" value="{{.SystemConfig.Template.GitRemoteName.Value ctx}}" maxlength="100" dir="auto" placeholder="{{.SystemConfig.Template.GitRemoteName.Def}}">
+			<input id="remote_name" name="value" value="{{.SystemConfig.Template.GitRemoteName.Value ctx}}" maxlength="100" dir="auto" required>
 		</div>
 		<div class="field">
 			<button class="ui primary button">{{ctx.Locale.Tr "save"}}</button>