diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6339cc..4b09d79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: - master - feature/** - hotfix/** + - release/** env: TZ: Australia/Canberra diff --git a/README.md b/README.md index 2cde783..12b75fd 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The ecodata client plugin is a grails plugin used to generate data entry forms from a metadata definition. It is used by the [MERIT](https://github.com/AtlasOfLivingAustralia/fieldcapture) and [BioCollect](https://github.com/AtlasOfLivingAustralia/fieldcapture) applications. ### Technologies -* Grails framework 4.0.10 +* Grails framework * Knockout JS * Bootstrap 4.6 diff --git a/build.gradle b/build.gradle index 7ae6ce1..f6aa563 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ plugins { } -version "6.3" +version "6.4-SNAPSHOT" group "org.grails.plugins" apply plugin:"eclipse" diff --git a/grails-app/assets/javascripts/speciesModel.js b/grails-app/assets/javascripts/speciesModel.js index fcb52da..f29bd78 100644 --- a/grails-app/assets/javascripts/speciesModel.js +++ b/grails-app/assets/javascripts/speciesModel.js @@ -254,6 +254,9 @@ var SpeciesViewModel = function(data, options, context) { self.transients.bieUrl = ko.observable(); self.transients.speciesInformation = ko.observable(); self.transients.speciesTitle = ko.observable(); + self.transients.matched = ko.computed(function() { + return self.guid() && self.guid() != "A_GUID" && self.listId != "unmatched"; + }); self.transients.editing = ko.observable(false); self.transients.textFieldValue = ko.observable(); self.transients.bioProfileUrl = ko.computed(function (){ diff --git a/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy b/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy index bcf9b52..c332d91 100644 --- a/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy +++ b/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy @@ -138,7 +138,7 @@ public class EditModelWidgetRenderer implements ModelWidgetRenderer { } private static boolean isReadOnly(WidgetRenderContext context) { - context.model.readonly || context.dataModel.computed + context.model.readonly || context.dataModel?.computed } @Override void renderSelectMany(WidgetRenderContext context) { @@ -371,8 +371,8 @@ public class EditModelWidgetRenderer implements ModelWidgetRenderer { context.writer << """
-
- +
+
""" }