Skip to content

Commit 76fece1

Browse files
bfederlebfederle
committed
CLOUDSTACK-4077: Fix refresh issue; localization labels
-Localize labels for event/alerts -Fix UI refresh issue when performing delete/archive actions
1 parent 099d351 commit 76fece1

3 files changed

Lines changed: 44 additions & 80 deletions

File tree

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17+
label.delete.events=Delete events
18+
label.delete.alerts=Delete alerts
19+
label.archive.alerts=Archive alerts
20+
label.archive.events=Archive events
21+
label.by.alert.type=By alert type
22+
label.by.event.type=By event type
23+
label.by.date.start=By date (start)
24+
label.by.date.end=By date (end)
1725
label.switch.type=Switch Type
1826
label.service.state=Service State
1927
label.egress.default.policy=Egress Default Policy

‎ui/dictionary.jsp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ under the License.
2525
<% long now = System.currentTimeMillis(); %>
2626
<script language="javascript">
2727
dictionary = {
28+
'label.delete.events': '<fmt:message key="label.delete.events" />',
29+
'label.delete.alerts': '<fmt:message key="label.delete.alerts" />',
30+
'label.archive.events': '<fmt:message key="label.archive.events" />',
31+
'label.archive.alerts': '<fmt:message key="label.archive.alerts" />',
32+
'label.by.alert.type': '<fmt:message key="label.by.alert.type" />',
33+
'label.by.event.type': '<fmt:message key="label.by.event.type" />',
34+
'label.by.date.start': '<fmt:message key="label.by.date.start" />',
35+
'label.by.date.end': '<fmt:message key="label.by.date.end" />',
2836
'label.switch.type': '<fmt:message key="label.switch.type" />',
2937
'label.service.state': '<fmt:message key="label.service.state" />',
3038
'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',

‎ui/scripts/events.js‎

Lines changed: 28 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@
5959
actions: {
6060
// Remove multiple events
6161
remove: {
62-
label: 'Delete Events',
62+
label: 'label.delete.events',
6363
isHeader: true,
6464
addRow: false,
6565
messages: {
6666
notification: function(args) {
67-
return 'Events Deleted';
67+
return 'label.delete.events';
6868
}
6969
},
7070
createForm: {
71-
title: 'Delete Events',
71+
title: 'label.delete.events',
7272
desc: '',
7373
fields: {
7474
type: {
75-
label: 'By event type',
75+
label: 'label.by.event.type',
7676
docID: 'helpEventsDeleteType'
7777
},
7878
startdate: {
79-
label: 'By date (start date)',
79+
label: 'label.by.date.start',
8080
docID: 'helpEventsDeleteDate',
8181
isDatepicker: true
8282
},
8383
enddate: {
84-
label: 'By date (end date)',
84+
label: 'label.by.date.end',
8585
docID: 'helpEventsDeleteDate',
8686
isDatepicker: true
8787
}
@@ -107,48 +107,40 @@
107107
});
108108

109109
$.ajax({
110-
111110
url: createURL("deleteEvents"),
112111
data: data,
113-
dataType: 'json',
114-
async: false,
115-
116112
success: function(data) {
117-
118113
args.response.success();
119-
120114
}
121115
});
122-
// Reloads window with events removed
123-
$(window).trigger('cloudStack.fullRefresh');
124116
}
125117
},
126118

127119
// Archive multiple events
128120
archive: {
129-
label: 'Archive Events',
121+
label: 'label.archive.events',
130122
isHeader: true,
131123
addRow: false,
132124
messages: {
133125
notification: function(args) {
134-
return 'Archive events';
126+
return 'label.archive.events';
135127
}
136128
},
137129
createForm: {
138-
title: 'Archive Events',
130+
title: 'label.archive.events',
139131
desc: '',
140132
fields: {
141133
type: {
142-
label: 'By event type',
134+
label: 'label.by.event.type',
143135
docID: 'helpEventsArchiveType'
144136
},
145137
startdate: {
146-
label: 'By date (start date)',
138+
label: 'label.by.date.start',
147139
docID: 'helpEventsArchiveDate',
148140
isDatepicker: true
149141
},
150142
enddate: {
151-
label: 'By date (end date)',
143+
label: 'label.by.date.end',
152144
docID: 'helpEventsArchiveDate',
153145
isDatepicker: true
154146
}
@@ -173,21 +165,16 @@
173165
});
174166

175167
$.ajax({
176-
177168
url: createURL("archiveEvents"),
178169
data: data,
179170
dataType: 'json',
180171
async: false,
181172

182173
success: function(data) {
183-
184174
args.response.success();
185-
186175
}
187176
});
188177

189-
// Reloads window with events removed
190-
$(window).trigger('cloudStack.fullRefresh');
191178
}
192179
}
193180

@@ -269,17 +256,6 @@
269256
return true;
270257
}
271258
}
272-
/*
273-
,
274-
startdate: {
275-
label: 'Start Date',
276-
isDatepicker: true
277-
},
278-
enddate: {
279-
label: 'End Date',
280-
isDatepicker: true
281-
}
282-
*/
283259
},
284260

285261
dataProvider: function(args) {
@@ -317,9 +293,8 @@
317293
$.ajax({
318294
url: createURL("deleteEvents&ids=" + args.context.events[0].id),
319295
success: function(json) {
320-
321296
args.response.success();
322-
297+
$(window).trigger('cloudStack.fullRefresh');
323298
}
324299

325300
});
@@ -342,16 +317,10 @@
342317
$.ajax({
343318
url: createURL("archiveEvents&ids=" + args.context.events[0].id),
344319
success: function(json) {
345-
346320
args.response.success();
347-
321+
$(window).trigger('cloudStack.fullRefresh');
348322
}
349-
350323
});
351-
352-
353-
// Reloads window with item archived
354-
$(window).trigger('cloudStack.fullRefresh');
355324
}
356325
}
357326
},
@@ -428,29 +397,29 @@
428397
actions: {
429398
// Remove multiple Alerts
430399
remove: {
431-
label: 'Delete Alerts',
400+
label: 'label.delete.alerts',
432401
isHeader: true,
433402
addRow: false,
434403
messages: {
435404
notification: function(args) {
436-
return 'Alerts Deleted';
405+
return 'label.delete.alerts';
437406
}
438407
},
439408
createForm: {
440-
title: 'Delete Alerts',
409+
title: 'label.delete.alerts',
441410
desc: '',
442411
fields: {
443412
type: {
444-
label: 'By Alert type',
413+
label: 'label.by.alert.type',
445414
docID: 'helpAlertsDeleteType'
446415
},
447416
startdate: {
448-
label: 'By date (start date)',
417+
label: 'label.by.date.start',
449418
docID: 'helpAlertsDeleteDate',
450419
isDatepicker: true
451420
},
452421
enddate: {
453-
label: 'By date (end than)',
422+
label: 'label.by.date.end',
454423
docID: 'helpAlertsDeleteDate',
455424
isDatepicker: true
456425
}
@@ -476,48 +445,43 @@
476445
});
477446

478447
$.ajax({
479-
480448
url: createURL("deleteAlerts"),
481449
data: data,
482450
dataType: 'json',
483451
async: false,
484452

485453
success: function(data) {
486-
487454
args.response.success();
488-
489455
}
490456
});
491-
// Reloads window with events removed
492-
$(window).trigger('cloudStack.fullRefresh');
493457
}
494458
},
495459

496460
// Archive multiple Alerts
497461
archive: {
498-
label: 'Archive Alerts',
462+
label: 'label.archive.alerts',
499463
isHeader: true,
500464
addRow: false,
501465
messages: {
502466
notification: function(args) {
503-
return 'Alerts Archived';
467+
return 'label.archive.alerts';
504468
}
505469
},
506470
createForm: {
507-
title: 'Archive Alerts',
471+
title: 'label.archive.alerts',
508472
desc: '',
509473
fields: {
510474
type: {
511-
label: 'By Alert type',
475+
label: 'label.by.alert.type',
512476
docID: 'helpAlertsArchiveType'
513477
},
514478
startdate: {
515-
label: 'By date (start date)',
479+
label: 'label.by.date.start',
516480
docID: 'helpAlertsArchiveDate',
517481
isDatepicker: true
518482
},
519483
enddate: {
520-
label: 'By date (end date)',
484+
label: 'label.by.date.end',
521485
docID: 'helpAlertsArchiveDate',
522486
isDatepicker: true
523487
}
@@ -543,24 +507,17 @@
543507
});
544508

545509
$.ajax({
546-
547510
url: createURL("archiveAlerts"),
548511
data: data,
549512
dataType: 'json',
550513
async: false,
551514

552515
success: function(data) {
553-
554516
args.response.success();
555-
556517
}
557518
});
558-
559-
// Reloads window with events removed
560-
$(window).trigger('cloudStack.fullRefresh');
561519
}
562520
}
563-
564521
},
565522

566523
dataProvider: function(args) {
@@ -599,13 +556,10 @@
599556
$.ajax({
600557
url: createURL("deleteAlerts&ids=" + args.context.alerts[0].id),
601558
success: function(json) {
602-
603559
args.response.success();
604-
560+
$(window).trigger('cloudStack.fullRefresh');
605561
}
606-
607562
});
608-
$(window).trigger('cloudStack.fullRefresh');
609563

610564
}
611565
},
@@ -625,16 +579,10 @@
625579
$.ajax({
626580
url: createURL("archiveAlerts&ids=" + args.context.alerts[0].id),
627581
success: function(json) {
628-
629582
args.response.success();
630-
583+
$(window).trigger('cloudStack.fullRefresh');
631584
}
632-
633585
});
634-
635-
636-
// Reloads window with item archived
637-
$(window).trigger('cloudStack.fullRefresh');
638586
}
639587
}
640588

0 commit comments

Comments
 (0)