Merge branch 'hotfix/5.0.3'

Author: temi

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id 'war'
 }
 
-version "5.0.2"
+version "5.0.3"
 group "au.org.ala"
 
 apply plugin:"eclipse"

grails-app/services/au/org/ala/biocollect/merit/SettingService.groovy

@@ -44,17 +44,11 @@ class SettingService {
     def loadHubConfig(hub) {
 
         if (!hub) {
-            // assign hub using the logic
-            // 1. Use previous hub from cookie.
-            // 2. Otherwise, use default hub setting.
+            hub = grailsApplication.config.app.default.hub?:'default'
             String previousHub = cookieService.getCookie(LAST_ACCESSED_HUB)
             if (!previousHub) {
-                hub = grailsApplication.config.app.default.hub?:'default'
                 cookieService.setCookie(LAST_ACCESSED_HUB, hub, -1 /* -1 means the cookie expires when the browser is closed */)
             }
-            else {
-                hub = previousHub
-            }
         }
         else {
             // Hub value in multiple places like url path and in parameter causes Array to be passed instead of String.