Encode expression as javascript to support nested quotes #222

AtlasOfLivingAustralia · Jan 3, 2024 · e75908e · e75908e · chrisala · Jan 3, 2024
1 parent 29fa9fe
commit e75908e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy b/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy
@@ -29,8 +29,8 @@ class ComputedValueRenderer {
             default:
                 expressionType = "evaluate"
         }
-
-        out << "return ecodata.forms.expressionEvaluator.${expressionType}('${expression}', ${dependantContext}, ${decimalPlaces});\n";
+        out << "var expression = '${expression.encodeAsJavaScript()}';\n"
+        out << "return ecodata.forms.expressionEvaluator.${expressionType}(expression, ${dependantContext}, ${decimalPlaces});\n";
     }
 
     private int getNumberOfDecimalPlaces(Map model, Map computed) {