Merge pull request #151 from AtlasOfLivingAustralia/master

Master to develop

Author: Rita-C

grails-app/controllers/au/org/ala/alerts/NotificationController.groovy

@@ -47,7 +47,7 @@ class NotificationController {
         def user = getUser()
         try {
             notificationService.subscribeMyAnnotation(user)
-            render([success: true] as JSON)
+            render ([success: true] as JSON)
         } catch (ignored) {
             response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "failed to subscribe to 'my annotation' alert for user " + user?.getUserId())
         }
@@ -58,7 +58,7 @@ class NotificationController {
         def user = getUser()
         try {
             notificationService.unsubscribeMyAnnotation(user)
-            render([success: true] as JSON)
+            render ([success: true] as JSON)
         } catch (ignored) {
             response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "failed to unsubscribe 'my annotation' alert for user " + user?.getUserId())
         }

grails-app/controllers/au/org/ala/alerts/UnsubscribeController.groovy

@@ -41,7 +41,6 @@ class UnsubscribeController {
                 if (userAndNotifications.notifications.any { it.query.queryPath == myAnnotationQueryPath }) {
                     notificationService.unsubscribeMyAnnotation(userAndNotifications.user)
                 }
-
                 render view: "unsubscribed"
             }
         }

grails-app/controllers/au/org/ala/alerts/WebserviceController.groovy

@@ -402,18 +402,19 @@ class WebserviceController {
         User user = userService.getUserById(params.userId)
         if (user == null) {
             response.status = HttpStatus.SC_NOT_FOUND
-            render([error: "can't find a user with userId " + params.userId] as JSON)
+            render ([error : "can't find a user with userId " + params.userId] as JSON)
         } else {
             render(userService.getUserAlertsConfig(user) as JSON)
         }
     }
 
     @RequireApiKey
     def subscribeMyAnnotationWS() {
-        User user = userService.getUser((String) params.userId)
+        User user = userService.getUser((String)params.userId)
         if (user == null) {
             response.status = HttpStatus.SC_NOT_FOUND
-            render([error: "can't find a user with userId " + params.userId] as JSON)
+            render ([error : "can't find a user with userId " + params.userId] as JSON)
+
         } else {
             try {
                 notificationService.subscribeMyAnnotation(user)
@@ -429,7 +430,7 @@ class WebserviceController {
         User user = userService.getUserById(params.userId)
         if (user == null) {
             response.status = HttpStatus.SC_NOT_FOUND
-            render([error: "can't find a user with userId " + params.userId] as JSON)
+            render ([error : "can't find a user with userId " + params.userId] as JSON)
         } else {
             try {
                 notificationService.unsubscribeMyAnnotation(user)

grails-app/services/au/org/ala/alerts/EmailService.groovy

@@ -89,15 +89,15 @@ class EmailService {
         def records = retrieveRecordForQuery(query, queryResult)
         def totalRecords = queryService.fireWhenNotZeroProperty(queryResult)
         [
-                title           : query.name,
-                message         : query.updateMessage,
-                moreInfo        : queryResult.queryUrlUIUsed,
-                listcode        : queryService.isMyAnnotation(query) ? "biocache.view.myannotation.list" : "biocache.view.list",
-                query           : query,
-                stopNotification: grailsApplication.config.security.cas.appServerName + grailsApplication.config.security.cas.contextPath + '/notification/myAlerts',
-                frequency       : frequency,
-                records         : records,
-                totalRecords    : totalRecords >= 0 ? totalRecords : records.size()
+            title           : query.name,
+            message         : query.updateMessage,
+            moreInfo        : queryResult.queryUrlUIUsed,
+            listcode        : queryService.isMyAnnotation(query) ? "biocache.view.myannotation.list" : "biocache.view.list",
+            query           : query,
+            stopNotification: grailsApplication.config.security.cas.appServerName + grailsApplication.config.security.cas.contextPath + '/notification/myAlerts',
+            frequency       : frequency,
+            records         : records,
+            totalRecords    : totalRecords >= 0 ? totalRecords : records.size()
         ]
     }
 
@@ -140,21 +140,21 @@ class EmailService {
                 subject query.name
                 bcc subsetOfAddresses
                 body(view: query.emailTemplate,
-                        plugin: "email-confirmation",
-                        model: [title           : localeSubject,
-                                message         : query.updateMessage,
-                                query           : query,
-                                moreInfo        : queryResult.queryUrlUIUsed,
-                                speciesListInfo : speciesListInfo,
-                                userAssertions  : userAssertions,
-                                listcode        : queryService.isMyAnnotation(query) ? "biocache.view.myannotation.list" : "biocache.view.list",
-                                stopNotification: urlPrefix + '/notification/myAlerts',
-                                records         : records,
-                                frequency       : messageSource.getMessage('frequency.' + frequency, null, siteLocale),
-                                totalRecords    : (totalRecords >= 0 ? totalRecords : records.size()),
-                                unsubscribeAll  : urlPrefix + "/unsubscribe?token=" + userUnsubToken,
-                                unsubscribeOne  : urlPrefix + "/unsubscribe?token=" + notificationUnsubToken
-                        ])
+                    plugin: "email-confirmation",
+                    model: [title: localeSubject,
+                        message: query.updateMessage,
+                        query: query,
+                        moreInfo: queryResult.queryUrlUIUsed,
+                        speciesListInfo: speciesListInfo,
+                        userAssertions: userAssertions,
+                        listcode: queryService.isMyAnnotation(query) ? "biocache.view.myannotation.list" : "biocache.view.list",
+                        stopNotification: urlPrefix + '/notification/myAlerts',
+                        records: records,
+                        frequency: messageSource.getMessage('frequency.' + frequency, null, siteLocale),
+                        totalRecords: (totalRecords >= 0 ? totalRecords : records.size()),
+                        unsubscribeAll: urlPrefix + "/unsubscribe?token=" + userUnsubToken,
+                        unsubscribeOne: urlPrefix + "/unsubscribe?token=" + notificationUnsubToken
+                    ])
             }
         } catch (Exception e) {
             log.error("Error sending email to addresses: " + subsetOfAddresses, e)