Version 1.4.2.2

Fix index out of bounds error on formatted name construction Move to version of ala-auth compatible with CAS on oztaxa
AtlasOfLivingAustralia · Jun 18, 2018 · 5653836 · 5653836
1 parent 6de8f6f
commit 5653836
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 }
 
-version "1.4.2.1"
+version "1.4.2.2"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -73,7 +73,7 @@ dependencies {
     compile 'org.grails.plugins:external-config:1.1.1'
 
     compile group: 'org.grails.plugins', name: 'ala-bootstrap3', version: '3.0.3'
-    compile(group: 'org.grails.plugins', name: 'ala-auth', version:'3.1.0') {
+    compile(group: 'org.grails.plugins', name: 'ala-auth', version:'3.0.4') {
         exclude group: 'javax.servlet', module: 'servlet-api'
     }
     compile group: 'org.grails.plugins', name: 'ala-admin-plugin', version: '2.0'

diff --git a/grails-app/services/au/org/ala/bie/ImportService.groovy b/grails-app/services/au/org/ala/bie/ImportService.groovy
@@ -2149,9 +2149,9 @@ class ImportService {
             return nameFormatted
         if (nameComplete) {
             def authorIndex = scientificNameAuthorship ? nameComplete.indexOf(scientificNameAuthorship) : -1
-            if (authorIndex < 0)
+            if (authorIndex <= 0)
                 return "<span class=\"${formattedCssClass}\">${StringEscapeUtils.escapeHtml(nameComplete)}</span>"
-            def preAuthor = nameComplete.substring(0, authorIndex - 1).trim()
+            def preAuthor = nameComplete.substring(0, authorIndex).trim()
             def postAuthor = nameComplete.substring(authorIndex + scientificNameAuthorship.length()).trim()
             def name = "<span class=\"${formattedCssClass}\">"
             if (preAuthor && !preAuthor.isEmpty())