Merge branch 'release/4.0.5'

Author: sbearcsiro

build.gradle

@@ -23,7 +23,7 @@ plugins {
     //    id "com.moowork.node" version "1.1.1"
 }
 
-version "4.0.4"
+version "4.0.5"
 group "au.org.ala"
 description "Digivol application"
 

grails-app/controllers/au/org/ala/volunteer/UserController.groovy

@@ -2,6 +2,7 @@ package au.org.ala.volunteer
 
 import com.google.common.base.Stopwatch
 import grails.converters.JSON
+import grails.transaction.Transactional
 import grails.web.servlet.mvc.GrailsParameterMap
 import org.elasticsearch.action.search.SearchResponse
 import org.elasticsearch.action.search.SearchType
@@ -414,6 +415,7 @@ class UserController {
         return [userInstance: userInstance, roles: roles, userDetails: authService.getUserForUserId(userInstance.getUserId())]
     }
 
+    @Transactional
     def update() {
         def userInstance = User.get(params.id)
         def currentUser = userService.currentUserId
@@ -442,6 +444,7 @@ class UserController {
         }
     }
 
+    @Transactional
     def delete() {
         def userInstance = User.get(params.id)
         def currentUser = userService.currentUserId
@@ -480,6 +483,7 @@ class UserController {
         [userInstance: userInstance, currentUser: currentUser, roles: Role.list(), projects: Project.list(sort: 'name', order: 'asc')]
     }
 
+    @Transactional
     def updateRoles() {
         def userInstance = User.get(params.id)
 

grails-app/services/au/org/ala/volunteer/UserService.groovy

@@ -50,17 +50,17 @@ class UserService {
                 user.created = new Date()
                 user.firstName = firstName
                 user.lastName = lastName
-                user.save(flush: true)
+                def savedUser = user.save(flush: true)
                 // Notify admins that a new user has registered
-                notifyNewUser(user)
+                notifyNewUser(savedUser, displayName)
             }
         }
     }
 
     @NotTransactional
-    private void notifyNewUser(User user) {
+    private void notifyNewUser(User user, String displayName) {
         def interestedUsers = getUsersWithRole(BVPRole.SITE_ADMIN)
-        def message = groovyPageRenderer.render(view: '/user/newUserRegistrationMessage', model: [user: user])
+        def message = groovyPageRenderer.render(view: '/user/newUserRegistrationMessage', model: [user: user, displayName: displayName])
         def appName = messageSource.getMessage("default.application.name", null, "DigiVol", LocaleContextHolder.locale)
 
         interestedUsers.each {

grails-app/views/mail/newTranscribers.gsp

@@ -9,7 +9,7 @@
 <p>The following users have completed their fifth transcription within the last 24 hours:</p>
 <ul>
     <g:each in="${newTranscribers}" var="t">
-        <li><g:link absolute="true" controller="user" action="show" id="${t.userId}">${t.displayName}</g:link></li>
+        <li><g:link absolute="true" controller="user" action="show" id="${t.id}">${t.displayName}</g:link></li>
     </g:each>
 </ul>
 </body>

grails-app/views/user/newUserRegistrationMessage.gsp

@@ -5,8 +5,10 @@ This message was automatically generated by <g:message code="default.application
 
 A new user has registered on <g:message code="default.application.name"/>.
 
-Name : ${user.displayName}
-Email : ${user.userId}
+Name : ${displayName}
+UserId : ${user.userId}
+Email : ${user.email}
+Profile: <g:createLink absolute="true" controller="user" action="show" id="${user.id}" />
 User created: ${formatDate(date: user.created, format: DateConstants.DATE_TIME_FORMAT)}
 
 You are receiving this email because you are a site administrator. If you do not wish to receive any more of these messages please contact