Skip to content

Commit 2225aca

Browse files
author
Vitalii Samolovskikh
committed
Regenerate the AsynchronousMailController
1 parent 8d774ba commit 2225aca

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

grails-app/controllers/sample/AsynchronousMailController.groovy

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ class AsynchronousMailController {
99
static allowedMethods = [update: 'POST']
1010

1111
/**
12-
* Show all message in table.
12+
* List messages.
1313
*/
1414
def list() {
1515
params.max = Math.min(params.max ? params.max.toInteger() : 10, 100)
1616
params.sort = params.sort ?: 'createDate'
1717
params.order = params.order ?: 'desc'
18-
[list: AsynchronousMailMessage.list(params), total: AsynchronousMailMessage.count()]
18+
[resultList: AsynchronousMailMessage.list(params)]
1919
}
2020

2121
private withMessage(Closure cl) {
@@ -24,7 +24,7 @@ class AsynchronousMailController {
2424
return cl(message)
2525
}
2626

27-
flash.message = "Message with id ${params.id} not found."
27+
flash.message = "The message ${params.id} was not found."
2828
flash.error = true
2929
redirect(action: 'list')
3030
}
@@ -33,42 +33,42 @@ class AsynchronousMailController {
3333
* Show message data.
3434
*/
3535
def show() {
36-
withMessage { AsynchronousMailMessage message ->
36+
withMessage {AsynchronousMailMessage message ->
3737
return [message: message]
3838
}
3939
}
4040

4141
/**
42-
* Show form for editing.
42+
* Edit message data.
4343
*/
4444
def edit() {
45-
withMessage { AsynchronousMailMessage message ->
45+
withMessage {AsynchronousMailMessage message ->
4646
return [message: message]
4747
}
4848
}
4949

5050
/**
51-
* Update message
51+
* Update message.
5252
*/
5353
def update() {
54-
withMessage { AsynchronousMailMessage message ->
54+
withMessage {AsynchronousMailMessage message ->
5555
bindData(
5656
message, params,
5757
[include:
58-
[
59-
'status',
60-
'beginDate',
61-
'endDate',
62-
'maxAttemptsCount',
63-
'attemptInterval',
64-
'priority',
65-
'markDelete'
66-
]
58+
[
59+
'status',
60+
'beginDate',
61+
'endDate',
62+
'maxAttemptsCount',
63+
'attemptInterval',
64+
'priority',
65+
'markDelete'
66+
]
6767
]
6868
)
6969
message.attemptsCount = 0
7070
if (!message.hasErrors() && message.save()) {
71-
flash.message = "Message ${params.id} was updated."
71+
flash.message = "The message ${params.id} was updated."
7272
redirect(action: 'show', id: message.id)
7373
} else {
7474
render(view: 'edit', model: [message: message])
@@ -77,37 +77,39 @@ class AsynchronousMailController {
7777
}
7878

7979
/**
80-
* Abort message sent
80+
* Abort message sending.
8181
*/
8282
def abort() {
83-
withMessage { AsynchronousMailMessage message ->
83+
withMessage {AsynchronousMailMessage message ->
8484
if (message.abortable) {
8585
message.status = MessageStatus.ABORT
8686
if (message.save()) {
87-
flash.message = "Message ${message.id} was aborted."
87+
flash.message = "The message ${message.id} was aborted."
8888
} else {
89-
flash.message = "Can't abort message with id ${message.id}."
89+
flash.message = "Can't abort the message ${message.id}."
9090
flash.error = true
9191
}
9292
} else {
93-
flash.message = "Can't abort message with id ${message.id} and status ${message.status}."
93+
flash.message = "Can't abort the message ${message.id} with the status ${message.status}."
9494
flash.error = true
9595
}
9696
redirect(action: 'list')
9797
}
9898
}
9999

100100
/**
101-
* Delete message
101+
* Delete message.
102102
*/
103103
def delete() {
104-
withMessage { AsynchronousMailMessage message ->
104+
withMessage {AsynchronousMailMessage message ->
105105
try {
106106
message.delete()
107-
flash.message = "Message with id ${message.id} was deleted."
107+
flash.message = "The message ${message.id} was deleted."
108108
redirect(action: 'list')
109109
} catch (Exception e) {
110-
flash.message = "Can't delete message with id ${message.id}."
110+
def errorMessage = "Can't delete the message with the id ${message.id}.";
111+
log.error(errorMessage, e)
112+
flash.message = errorMessage
111113
flash.error = true
112114
redirect(action: 'show', id: message.id)
113115
}

grails-app/views/asynchronousMail/list.gsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</tr>
3434
</thead>
3535
<tbody>
36-
<g:each in="${list}" status="i" var="message">
36+
<g:each in="${resultList}" status="i" var="message">
3737
<tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
3838
<td class="id">${message.id}</td>
3939
<td><g:link action="show" id="${message.id}">${fieldValue(bean: message, field: 'subject')}</g:link></td>
@@ -56,7 +56,7 @@
5656
</table>
5757

5858
<div class="paginate">
59-
<g:paginate total="${total}"/>
59+
<g:paginate total="${resultList.totalCount}"/>
6060
</div>
6161
</div>
6262
</body>

0 commit comments

Comments
 (0)