Don't double render load method fieldcapture#2940

AtlasOfLivingAustralia · Jul 28, 2023 · 4ca73f3 · 4ca73f3
1 parent 844b6cd
commit 4ca73f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy
@@ -268,7 +268,10 @@ class ModelJSTagLib {
                 if (requiresMetadataExtender(mod)) {
                     out << INDENT*4 << "${ctx.propertyPath}['${mod.name}'].load(${value});\n"
                 }
-                out << INDENT*4 << "${ctx.propertyPath}['${mod.name}'](${value});\n"
+                else {
+                    out << INDENT*4 << "${ctx.propertyPath}['${mod.name}'](${value});\n"
+                }
+
             }
         }
         else if (mod.dataType in ['image', 'photoPoints', 'audio', 'set']) {

diff --git a/src/test/groovy/au/org/ala/ecodata/forms/ModelJSTagLibSpec.groovy b/src/test/groovy/au/org/ala/ecodata/forms/ModelJSTagLibSpec.groovy
@@ -243,7 +243,7 @@ class ModelJSTagLibSpec extends Specification implements TagLibUnitTest<ModelJST
         tagLib.renderInitialiser(ctx)
 
         then:
-        compareWithoutWhiteSpace("data['test'].load(ecodata.forms.orDefault(data['test'],undefined));data['test'](ecodata.forms.orDefault(data['test'],undefined));", actualOut.toString())
+        compareWithoutWhiteSpace("data['test'].load(ecodata.forms.orDefault(data['test'],undefined));", actualOut.toString())
     }
 
     def "Input data is null/undefined checked before calling loadData() on SpeciesViewModel"() {