Merge pull request #362 from AtlasOfLivingAustralia/release/2.1.8

Release/2.1.8
AtlasOfLivingAustralia · Jul 6, 2020 · df8da8e · df8da8e
2 parents feaedce + 84659c5
commit df8da8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "2.1.8-SNAPSHOT"
+version "2.1.8"
 group "au.org.ala.plugins.grails"
 
 apply plugin:"eclipse"
@@ -81,7 +81,7 @@ dependencies {
     compile "org.grails.plugins:ala-auth:3.2.2", noCache
 
     if(!inplace) {
-        compile "au.org.ala.plugins.grails:images-client-plugin:1.0", noCache
+        compile "au.org.ala.plugins.grails:images-client-plugin:1.2", noCache
         compile "au.org.ala.plugins.grails:ala-charts-plugin:2.0.1", noCache
     }
 

diff --git a/grails-app/views/occurrence/list.gsp b/grails-app/views/occurrence/list.gsp
@@ -60,7 +60,7 @@
             dislikeUrl: "${createLink(controller: 'imageClient', action: 'dislikeImage')}",
             userRatingUrl: "${createLink(controller: 'imageClient', action: 'userRating')}",
             disableLikeDislikeButton: ${authService.getUserId() ? false : true},
-            addLikeDislikeButton: ${(grailsApplication.config.addLikeDislikeButton == false) ? false : true},
+            addLikeDislikeButton: ${(grailsApplication.config.getProperty("addLikeDislikeButton", Boolean, false))},
             addPreferenceButton: <imageClient:checkAllowableEditRole/> ,
             userRatingHelpText: '<div><b>Up vote (<i class="fa fa-thumbs-o-up" aria-hidden="true"></i>) an image:</b>'+
 ' Image supports the identification of the species or is representative of the species.  Subject is clearly visible including identifying features.<br/><br/>'+