Support computed stringList variables #212

AtlasOfLivingAustralia · Sep 28, 2023 · 8dbd40c · 8dbd40c
1 parent b28d0db
commit 8dbd40c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -385,11 +385,20 @@ function orEmptyArray(v) {
             return result;
         }
 
+        function evaluateArray(expression, context) {
+            var result = evaluateInternal(expression, context);
+            if (!_.isArray(result))  {
+                result = [result];
+            }
+            return result;
+        }
+
         return {
             evaluate: evaluateNumber,
             evaluateBoolean: evaluateBoolean,
             evaluateString: evaluateString,
-            evaluateUntyped: evaluateUntyped
+            evaluateUntyped: evaluateUntyped,
+            evaluateArray: evaluateArray
         }
 
     }();

diff --git a/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy b/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy
@@ -23,6 +23,9 @@ class ComputedValueRenderer {
             case 'date':
                 expressionType = 'evaluateString'
                 break
+            case 'stringList':
+                expressionType = 'evaluateArray'
+                break
             default:
                 expressionType = "evaluate"
         }

diff --git a/src/main/groovy/au/org/ala/ecodata/forms/ValidationHelper.groovy b/src/main/groovy/au/org/ala/ecodata/forms/ValidationHelper.groovy
@@ -92,7 +92,7 @@ class ValidationHelper {
         criteria.each {
             switch (it.rule) {
                 case 'required':
-                    if (model.type == 'selectMany') {
+                    if (model.type == 'selectMany' && !model.readonly && !dataModel.readonly) {
                         values << 'minCheckbox[1]'
                     }
                     else {