Merge pull request #147 from AtlasOfLivingAustralia/hotfix/4.0.5

Hotfix/4.0.5

Author: temi

build.gradle

@@ -14,7 +14,7 @@ buildscript {
     }
 }
 
-version "4.0.4"
+version "4.0.5-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"
@@ -83,7 +83,7 @@ dependencies {
 
 
     if (!inplace) {
-        compile ("org.grails.plugins:ala-map-plugin:3.0") {
+        compile ("org.grails.plugins:ala-map-plugin:3.0.1") {
             exclude group: 'com.bertramlabs.plugins', module: 'asset-pipeline-grails'
         }
     }

grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy

@@ -275,7 +275,9 @@ class ModelJSTagLib {
             out << INDENT*4 << "self.load${mod.name}(${value});\n"
         }
         else if (mod.dataType == 'species') {
+            out << INDENT*4 << "if (data['${mod.name}']) {\n"
             out << INDENT*4 << "${ctx.propertyPath}['${mod.name}'].loadData(${value});\n"
+            out << INDENT*4 << "}\n"
         }
         else if (mod.dataType == 'document') {
             out << INDENT*4 << "var doc = _.find(context.documents || [], function(document) { if (data['${mod.name}']) \n return document.documentId == data['${mod.name}'] || document.documentId ==  data['${mod.name}'].documentId ;\n else \n return false });"

src/test/groovy/au/org/ala/ecodata/forms/ModelJSTagLibSpec.groovy

@@ -232,6 +232,20 @@ class ModelJSTagLibSpec extends Specification implements TagLibUnitTest<ModelJST
         compareWithoutWhiteSpace("data['test'].load(ecodata.forms.orDefault(data['test'],undefined));data['test'](ecodata.forms.orDefault(data['test'],undefined));", actualOut.toString())
     }
 
+    def "Input data is null/undefined checked before calling loadData() on SpeciesViewModel"() {
+        setup:
+        Map dataModel = [name:'test', dataType:'species']
+        ctx.dataModel = dataModel
+        ctx.propertyPath = 'self.data'
+        ctx.attrs = [:]
+
+        when:
+        tagLib.renderInitialiser(ctx)
+
+        then:
+        compareWithoutWhiteSpace("if(data['test']){self.data['test'].loadData(ecodata.forms.orDefault(data['test'], {}));}", actualOut.toString())
+    }
+
     def "The lookup table data type is rendered correctly"() {
         setup:
         List lookupTable = [[input:'a', output:'1'], [input:'b', output:'2']]