#218 convert "true"/"false" String to boolean values as intended, cod…

…e review.
AtlasOfLivingAustralia · Jun 3, 2020 · 9f80bf9 · 9f80bf9 · charvolant · Jun 3, 2020
1 parent 11614bf
commit 9f80bf9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/grails-app/controllers/au/org/ala/bie/ExternalSiteController.groovy b/grails-app/controllers/au/org/ala/bie/ExternalSiteController.groovy
@@ -37,7 +37,7 @@ class ExternalSiteController {
     RateLimiter genbankRateLimiter = RateLimiter.create(3.0) // rate max requests per second (Double)
 
     // by default do not sanitise EOL response
-    boolean sanitiseEol = grailsApplication.config.eol.sanitise ?: "false".toBoolean()
+    boolean sanitiseEol = grailsApplication.config.getProperty("eol.sanitise", Boolean, false)
 
     def index() {}
 

diff --git a/grails-app/views/species/_names.gsp b/grails-app/views/species/_names.gsp
@@ -174,7 +174,7 @@
                     </td>
                     <td class="source">
                         <ul>
-                            <g:if test="${grailsApplication.config.vernacularName.pull.showLanguage?:"false".toBoolean()}">
+                            <g:if test="${grailsApplication.config.getProperty("vernacularName.pull.showLanguage", Boolean, false)}">
                                 <li>
                                     <bie:showLanguage lang="${language}"/>
                                 </li>

diff --git a/grails-app/views/species/show.gsp b/grails-app/views/species/show.gsp
@@ -102,7 +102,7 @@
             <g:if test="${tc?.taxonConcept?.acceptedConceptName}">
                 <h2><g:link uri="/species/${tc.taxonConcept.acceptedConceptID}">${tc.taxonConcept.acceptedConceptName}</g:link></h2>
             </g:if>
-            <g:if test="${grailsApplication.config.vernacularName.pull.showHeader?:"false".toBoolean() && tc.pullCommonNames}">
+            <g:if test="${grailsApplication.config.getProperty("vernacularName.pull.showHeader", Boolean, false) && tc.pullCommonNames}">
                 <g:each in="${tc.pullCommonNames}" var="cn" status="cni">
                     <g:if test="${cni % 2 == 0}"><g:if test="${cni != 0}"></div></g:if><div class="row"></g:if>
                     <div class="col-md-6"><h2><bie:markLanguage text="${cn.nameString}" lang="${cn.language}" mark="${grailsApplication.config.vernacularName.pull.showLanguage}" tag="${false}"/></h2></div>