Merge branch 'master' into mongodb

Author: Vitalii Samolovskikh

grails-app/controllers/sample/AsynchronousMailController.groovy

@@ -1,5 +1,6 @@
 package sample
 
+
 import grails.plugin.asyncmail.AsynchronousMailMessage
 import grails.plugin.asyncmail.MessageStatus
 
@@ -9,13 +10,13 @@ class AsynchronousMailController {
     static allowedMethods = [update: 'POST']
 
     /**
-     * Show all message in table.
+     * List messages.
      */
     def list() {
         params.max = Math.min(params.max ? params.max.toInteger() : 10, 100)
         params.sort = params.sort ?: 'createDate'
         params.order = params.order ?: 'desc'
-        [list: AsynchronousMailMessage.list(params), total: AsynchronousMailMessage.count()]
+        [resultList: AsynchronousMailMessage.list(params)]
     }
 
     private withMessage(Closure cl) {
@@ -24,7 +25,7 @@ class AsynchronousMailController {
             return cl(message)
         }
 
-        flash.message = "Message with id ${params.id} not found."
+        flash.message = "The message ${params.id} was not found."
         flash.error = true
         redirect(action: 'list')
     }
@@ -33,42 +34,42 @@ class AsynchronousMailController {
      * Show message data.
      */
     def show() {
-        withMessage { AsynchronousMailMessage message ->
+        withMessage {AsynchronousMailMessage message ->
             return [message: message]
         }
     }
 
     /**
-     * Show form for editing.
+     * Edit message data.
      */
     def edit() {
-        withMessage { AsynchronousMailMessage message ->
+        withMessage {AsynchronousMailMessage message ->
             return [message: message]
         }
     }
 
     /**
-     * Update message
+     * Update message.
      */
     def update() {
-        withMessage { AsynchronousMailMessage message ->
+        withMessage {AsynchronousMailMessage message ->
             bindData(
                     message, params,
                     [include:
-                             [
-                                     'status',
-                                     'beginDate',
-                                     'endDate',
-                                     'maxAttemptsCount',
-                                     'attemptInterval',
-                                     'priority',
-                                     'markDelete'
-                             ]
+                            [
+                                    'status',
+                                    'beginDate',
+                                    'endDate',
+                                    'maxAttemptsCount',
+                                    'attemptInterval',
+                                    'priority',
+                                    'markDelete'
+                            ]
                     ]
             )
             message.attemptsCount = 0
-            if (!message.hasErrors() && message.save()) {
-                flash.message = "Message ${params.id} was updated."
+            if (!message.hasErrors() && message.save(flush: true)) {
+                flash.message = "The message ${params.id} was updated."
                 redirect(action: 'show', id: message.id)
             } else {
                 render(view: 'edit', model: [message: message])
@@ -77,37 +78,39 @@ class AsynchronousMailController {
     }
 
     /**
-     * Abort message sent
+     * Abort message sending.
      */
     def abort() {
-        withMessage { AsynchronousMailMessage message ->
+        withMessage {AsynchronousMailMessage message ->
             if (message.abortable) {
                 message.status = MessageStatus.ABORT
-                if (message.save()) {
-                    flash.message = "Message ${message.id} was aborted."
+                if (message.save(flush: true)) {
+                    flash.message = "The message ${message.id} was aborted."
                 } else {
-                    flash.message = "Can't abort message with id ${message.id}."
+                    flash.message = "Can't abort the message ${message.id}."
                     flash.error = true
                 }
             } else {
-                flash.message = "Can't abort message with id ${message.id} and status ${message.status}."
+                flash.message = "Can't abort the message ${message.id} with the status ${message.status}."
                 flash.error = true
             }
             redirect(action: 'list')
         }
     }
 
     /**
-     * Delete message
+     * Delete message.
      */
     def delete() {
-        withMessage { AsynchronousMailMessage message ->
+        withMessage {AsynchronousMailMessage message ->
             try {
-                message.delete()
-                flash.message = "Message with id ${message.id} was deleted."
+                message.delete(flush: true)
+                flash.message = "The message ${message.id} was deleted."
                 redirect(action: 'list')
             } catch (Exception e) {
-                flash.message = "Can't delete message with id ${message.id}."
+                def errorMessage = "Can't delete the message with the id ${message.id}.";
+                log.error(errorMessage, e)
+                flash.message = errorMessage
                 flash.error = true
                 redirect(action: 'show', id: message.id)
             }

grails-app/views/asynchronousMail/list.gsp

@@ -33,7 +33,7 @@
         </tr>
         </thead>
         <tbody>
-        <g:each in="${list}" status="i" var="message">
+        <g:each in="${resultList}" status="i" var="message">
             <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
                 <td class="id">${message.id}</td>
                 <td><g:link action="show" id="${message.id}">${fieldValue(bean: message, field: 'subject')}</g:link></td>
@@ -56,7 +56,7 @@
     </table>
 
     <div class="paginate">
-        <g:paginate total="${total}"/>
+        <g:paginate total="${resultList.totalCount}"/>
     </div>
 </div>
 </body>