merged dev into cognito branch

AtlasOfLivingAustralia · Nov 27, 2024 · 6b0b7b2 · 6b0b7b2
2 parents b245826 + fb919b2
commit 6b0b7b2
Show file tree

Hide file tree

Showing 5 changed files with 371 additions and 140 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "7.0-PWA-SNAPSHOT"
+version "7.1-PWA-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

diff --git a/grails-app/assets/javascripts/speciesModel.js b/grails-app/assets/javascripts/speciesModel.js
@@ -286,7 +286,8 @@ var SpeciesViewModel = function(data, options, context) {
             name:self.name(),
             scientificName:self.scientificName(),
             commonName:self.commonName(),
-            listId:self.listId
+            listId:self.listId,
+            outputSpeciesId:self.outputSpeciesId()
         }
     };
 
@@ -298,9 +299,10 @@ var SpeciesViewModel = function(data, options, context) {
         if (!data) data = {};
 
         self.guid(orBlank(data.guid || data.lsid));
-        self.name(orBlank(data.name));
+        self.outputSpeciesId(orBlank(data.outputSpeciesId));
         self.listId(orBlank(data.listId));
         self.scientificName(orBlank(data.scientificName));
+        self.name(orBlank(data.name));
 
         if (!data.commonName) {
             if (data.kvpValues) {