Metadata editor / recommended values for fields show an empty value. (g…

…eonetwork#7232) * Metadata editor / recommended values for fields show an empty value. Fixes geonetwork#7231 * Metadata editor / recommended values for fields show an empty value - fix radio mode * Metadata editor / recommended values for fields - fix selected value in radio mode
GeoCat · Aug 29, 2023 · 3a33b6e · 3a33b6e
1 parent 59c9b0e
commit 3a33b6e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/web-ui/src/main/resources/catalog/components/edit/editorhelper/EditorHelperDirective.js b/web-ui/src/main/resources/catalog/components/edit/editorhelper/EditorHelperDirective.js
@@ -137,6 +137,15 @@
 
           // Load the config from the textarea containing the helpers
           scope.config = angular.fromJson($("#" + scope.ref + "_config")[0].value);
+          if (scope.mode == "") {
+            scope.config.defaultSelected = {
+              "@value": "",
+              "#text": $translate.instant("recommendedValues"),
+              disabled: true
+            };
+          } else {
+            scope.config.defaultSelected = {};
+          }
 
           // If only one option, convert to an array
           if (!$.isArray(scope.config.option)) {
@@ -146,6 +155,11 @@
             scope.config.option = scope.config;
           }
 
+          if (scope.mode == "") {
+            // Add on top the recommended values option
+            scope.config.option.unshift(scope.config.defaultSelected);
+          }
+
           // Add record formats if any
           scope.isProtocol =
             attrs.tooltip.indexOf && attrs.tooltip.indexOf("protocol|") !== -1;
@@ -180,7 +194,8 @@
           }
 
           // Set the initial value
-          scope.config.selected = {};
+          scope.config.selected = scope.config.defaultSelected;
+
           scope.config.value =
             field.type === "number" ? parseFloat(field.value) : field.value;
           scope.config.layout =

diff --git a/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html b/web-ui/src/main/resources/catalog/components/edit/editorhelper/partials/editorhelper.html
@@ -17,7 +17,7 @@
             type="radio"
             data-ng-click="select(o)"
             name="ignore_{{ref}}"
-            data-ng-checked="o['@value'] === config.value"
+            data-ng-checked="o['@value'] == config.value"
           />
           {{o['#text']}}
         </label>
@@ -70,9 +70,7 @@
         class="form-control"
         data-ng-model="config.selected"
         data-ng-options="o as o['#text'] disable when o.disabled for o in config.option"
-      >
-        <option value="" disabled="" data-translate="">recommendedValues</option>
-      </select>
+      ></select>
     </div>
   </div>
 </span>