5.0.2-SNAPSHOT

#1279 fixes issue with logging
fixes issue with refine button not working on data page
fixes issue with hub parameter having values as an array instead of string
fixed runtime error when a method cannot be found on a controller

Author: temi

.travis.yml

@@ -9,6 +9,7 @@ branches:
   - master
   - dev
   - /^feature\/.*$/
+  - /^hotfix\/.*$/
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id 'war'
 }
 
-version "5.0.1"
+version "5.0.2-SNAPSHOT"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -133,7 +133,7 @@ dependencies {
     compile "org.grails.plugins:ala-admin-plugin:2.1"
     if (!inplace) {
         compile "org.grails.plugins:ala-map-plugin:3.0"
-        compile "org.grails.plugins:ecodata-client-plugin:3.0.1"
+        compile "org.grails.plugins:ecodata-client-plugin:3.0.2-SNAPSHOT"
     }
 }
 

grails-app/assets/javascripts/facets.js

@@ -215,7 +215,7 @@ function FilterViewModel(config){
                 sanitisedList.push(item)
             }
         })
-        parent.resetPageOffSet();
+        parent.resetPageOffSet && parent.resetPageOffSet();
 
         self.selectedFacets.push.apply(self.selectedFacets, sanitisedList);
         self.hideAllTerms(sanitisedList);

grails-app/controllers/au/org/ala/biocollect/AclFilterInterceptor.groovy

@@ -31,7 +31,13 @@ class AclFilterInterceptor {
             return true
 
 
-        def method = controllerClass.getMethod(actionName?:"index", [] as Class[])
+        def method
+        def controllerActionName = actionName?:"index"
+        try {
+            method = controllerClass.getMethod(controllerActionName, [] as Class[])
+        } catch (NoSuchMethodException noMethod) {
+            log.error "No method, ${controllerActionName}, found for controller - ${controllerName}."
+        }
 
         def roles = roleService.getAugmentedRoles()
         def userId = userService.getCurrentUserId(request)
@@ -49,8 +55,8 @@ class AclFilterInterceptor {
             params.userIsAlaAdmin = false
         }
 
-        if (controllerClass.isAnnotationPresent(PreAuthorise) || method.isAnnotationPresent(PreAuthorise)) {
-            PreAuthorise pa = method.getAnnotation(PreAuthorise)?:controllerClass.getAnnotation(PreAuthorise)
+        if (controllerClass.isAnnotationPresent(PreAuthorise) || method?.isAnnotationPresent(PreAuthorise)) {
+            PreAuthorise pa = method?.getAnnotation(PreAuthorise)?:controllerClass.getAnnotation(PreAuthorise)
             if ((controllerClass != ProjectController) && (!pa.projectIdParam()?.equals('id'))) {
                 projectId = params[pa.projectIdParam()]
             }

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

@@ -44,19 +44,31 @@ class SettingService {
     def loadHubConfig(hub) {
 
         if (!hub) {
-            hub = grailsApplication.config.app.default.hub?:'default'
-            GrailsWebRequest.lookup()?.params.hub = hub
+            // assign hub using the logic
+            // 1. Use previous hub from cookie.
+            // 2. Otherwise, use default hub setting.
             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.
+            // This causes setCookie method to throw exception since it expects String.
+            if (hub && ((hub instanceof List) || hub.getClass().isArray())) {
+                hub = hub[0]
+            }
+
             // Store the most recently accessed hub in a cookie so that 404 errors can be presented with the
             // correct skin.
             cookieService.setCookie(LAST_ACCESSED_HUB, hub, -1 /* -1 means the cookie expires when the browser is closed */)
         }
 
+        GrailsWebRequest.lookup().params.hub = hub
         def settings = getHubSettings(hub)
         if (!settings) {
             log.warn("no settings returned for hub ${hub}!")

grails-app/views/bioActivity/previewActivity.gsp

@@ -3,14 +3,14 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/html">
 <head>
-    <meta name="layout" content="ajaxLayout"/>
+    <meta name="layout" content="${hubConfig.skin}"/>
 
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
     <asset:stylesheet src="common.css"/>
     <asset:stylesheet src="forms-manifest.css"/>
     <g:if test="${hubConfig.skin == "configurableHubTemplate1"}">
         <link rel="stylesheet" type="text/css"
-              href="${createLink(controller: 'hub', action: 'getStyleSheet')}?hub=${hubConfig.urlPath}&ver=${hubConfig.lastUpdated}">
+              href="${createLink(controller: 'hub', action: 'getStyleSheet')}?ver=${hubConfig.lastUpdated}">
     </g:if>
     <asset:script type="text/javascript">
     var fcConfig = {

grails-app/views/layouts/configurableHubTemplate1.gsp

@@ -85,7 +85,7 @@
     </asset:script>
     <g:layoutHead/>
     <link rel="stylesheet" type="text/css"
-          href="${createLink(controller: 'hub', action: 'getStyleSheet')}?hub=${hubConfig.urlPath}&ver=${hubConfig.lastUpdated}">
+          href="${createLink(controller: 'hub', action: 'getStyleSheet')}?ver=${hubConfig.lastUpdated}">
     <link href="${grailsApplication.config.skin.favicon}"  rel="icon"/>
 </head>