@@ -9,13 +9,13 @@ class AsynchronousMailController {
9
9
static allowedMethods = [update : ' POST' ]
10
10
11
11
/**
12
- * Show all message in table .
12
+ * List messages .
13
13
*/
14
14
def list () {
15
15
params. max = Math . min(params. max ? params. max. toInteger() : 10 , 100 )
16
16
params. sort = params. sort ?: ' createDate'
17
17
params. order = params. order ?: ' desc'
18
- [list : AsynchronousMailMessage . list(params), total : AsynchronousMailMessage . count( )]
18
+ [resultList : AsynchronousMailMessage . list(params)]
19
19
}
20
20
21
21
private withMessage (Closure cl ) {
@@ -24,7 +24,7 @@ class AsynchronousMailController {
24
24
return cl(message)
25
25
}
26
26
27
- flash. message = " Message with id ${ params.id} not found."
27
+ flash. message = " The message ${ params.id} was not found."
28
28
flash. error = true
29
29
redirect(action : ' list' )
30
30
}
@@ -33,42 +33,42 @@ class AsynchronousMailController {
33
33
* Show message data.
34
34
*/
35
35
def show () {
36
- withMessage { AsynchronousMailMessage message ->
36
+ withMessage {AsynchronousMailMessage message ->
37
37
return [message : message]
38
38
}
39
39
}
40
40
41
41
/**
42
- * Show form for editing .
42
+ * Edit message data .
43
43
*/
44
44
def edit () {
45
- withMessage { AsynchronousMailMessage message ->
45
+ withMessage {AsynchronousMailMessage message ->
46
46
return [message : message]
47
47
}
48
48
}
49
49
50
50
/**
51
- * Update message
51
+ * Update message.
52
52
*/
53
53
def update () {
54
- withMessage { AsynchronousMailMessage message ->
54
+ withMessage {AsynchronousMailMessage message ->
55
55
bindData(
56
56
message, params,
57
57
[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
+ ]
67
67
]
68
68
)
69
69
message. attemptsCount = 0
70
70
if (! message. hasErrors() && message. save()) {
71
- flash. message = " Message ${ params.id} was updated."
71
+ flash. message = " The message ${ params.id} was updated."
72
72
redirect(action : ' show' , id : message. id)
73
73
} else {
74
74
render(view : ' edit' , model : [message : message])
@@ -77,37 +77,39 @@ class AsynchronousMailController {
77
77
}
78
78
79
79
/**
80
- * Abort message sent
80
+ * Abort message sending.
81
81
*/
82
82
def abort () {
83
- withMessage { AsynchronousMailMessage message ->
83
+ withMessage {AsynchronousMailMessage message ->
84
84
if (message. abortable) {
85
85
message. status = MessageStatus . ABORT
86
86
if (message. save()) {
87
- flash. message = " Message ${ message.id} was aborted."
87
+ flash. message = " The message ${ message.id} was aborted."
88
88
} else {
89
- flash. message = " Can't abort message with id ${ message.id} ."
89
+ flash. message = " Can't abort the message ${ message.id} ."
90
90
flash. error = true
91
91
}
92
92
} 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} ."
94
94
flash. error = true
95
95
}
96
96
redirect(action : ' list' )
97
97
}
98
98
}
99
99
100
100
/**
101
- * Delete message
101
+ * Delete message.
102
102
*/
103
103
def delete () {
104
- withMessage { AsynchronousMailMessage message ->
104
+ withMessage {AsynchronousMailMessage message ->
105
105
try {
106
106
message. delete()
107
- flash. message = " Message with id ${ message.id} was deleted."
107
+ flash. message = " The message ${ message.id} was deleted."
108
108
redirect(action : ' list' )
109
109
} 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
111
113
flash. error = true
112
114
redirect(action : ' show' , id : message. id)
113
115
}
0 commit comments