mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-4077: Fix refresh issue; localization labels
-Localize labels for event/alerts -Fix UI refresh issue when performing delete/archive actions
This commit is contained in:
Brian Federle
parent
099d351227
commit
76fece149b
|
|
@ -14,6 +14,14 @@
|
|||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
label.delete.events=Delete events
|
||||
label.delete.alerts=Delete alerts
|
||||
label.archive.alerts=Archive alerts
|
||||
label.archive.events=Archive events
|
||||
label.by.alert.type=By alert type
|
||||
label.by.event.type=By event type
|
||||
label.by.date.start=By date (start)
|
||||
label.by.date.end=By date (end)
|
||||
label.switch.type=Switch Type
|
||||
label.service.state=Service State
|
||||
label.egress.default.policy=Egress Default Policy
|
||||
|
|
|
|||
|
|
@ -25,6 +25,14 @@ under the License.
|
|||
<% long now = System.currentTimeMillis(); %>
|
||||
<script language="javascript">
|
||||
dictionary = {
|
||||
'label.delete.events': '<fmt:message key="label.delete.events" />',
|
||||
'label.delete.alerts': '<fmt:message key="label.delete.alerts" />',
|
||||
'label.archive.events': '<fmt:message key="label.archive.events" />',
|
||||
'label.archive.alerts': '<fmt:message key="label.archive.alerts" />',
|
||||
'label.by.alert.type': '<fmt:message key="label.by.alert.type" />',
|
||||
'label.by.event.type': '<fmt:message key="label.by.event.type" />',
|
||||
'label.by.date.start': '<fmt:message key="label.by.date.start" />',
|
||||
'label.by.date.end': '<fmt:message key="label.by.date.end" />',
|
||||
'label.switch.type': '<fmt:message key="label.switch.type" />',
|
||||
'label.service.state': '<fmt:message key="label.service.state" />',
|
||||
'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
|
||||
|
|
|
|||
|
|
@ -59,29 +59,29 @@
|
|||
actions: {
|
||||
// Remove multiple events
|
||||
remove: {
|
||||
label: 'Delete Events',
|
||||
label: 'label.delete.events',
|
||||
isHeader: true,
|
||||
addRow: false,
|
||||
messages: {
|
||||
notification: function(args) {
|
||||
return 'Events Deleted';
|
||||
return 'label.delete.events';
|
||||
}
|
||||
},
|
||||
createForm: {
|
||||
title: 'Delete Events',
|
||||
title: 'label.delete.events',
|
||||
desc: '',
|
||||
fields: {
|
||||
type: {
|
||||
label: 'By event type',
|
||||
label: 'label.by.event.type',
|
||||
docID: 'helpEventsDeleteType'
|
||||
},
|
||||
startdate: {
|
||||
label: 'By date (start date)',
|
||||
label: 'label.by.date.start',
|
||||
docID: 'helpEventsDeleteDate',
|
||||
isDatepicker: true
|
||||
},
|
||||
enddate: {
|
||||
label: 'By date (end date)',
|
||||
label: 'label.by.date.end',
|
||||
docID: 'helpEventsDeleteDate',
|
||||
isDatepicker: true
|
||||
}
|
||||
|
|
@ -107,48 +107,40 @@
|
|||
});
|
||||
|
||||
$.ajax({
|
||||
|
||||
url: createURL("deleteEvents"),
|
||||
data: data,
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
|
||||
success: function(data) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
}
|
||||
});
|
||||
// Reloads window with events removed
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
},
|
||||
|
||||
// Archive multiple events
|
||||
archive: {
|
||||
label: 'Archive Events',
|
||||
label: 'label.archive.events',
|
||||
isHeader: true,
|
||||
addRow: false,
|
||||
messages: {
|
||||
notification: function(args) {
|
||||
return 'Archive events';
|
||||
return 'label.archive.events';
|
||||
}
|
||||
},
|
||||
createForm: {
|
||||
title: 'Archive Events',
|
||||
title: 'label.archive.events',
|
||||
desc: '',
|
||||
fields: {
|
||||
type: {
|
||||
label: 'By event type',
|
||||
label: 'label.by.event.type',
|
||||
docID: 'helpEventsArchiveType'
|
||||
},
|
||||
startdate: {
|
||||
label: 'By date (start date)',
|
||||
label: 'label.by.date.start',
|
||||
docID: 'helpEventsArchiveDate',
|
||||
isDatepicker: true
|
||||
},
|
||||
enddate: {
|
||||
label: 'By date (end date)',
|
||||
label: 'label.by.date.end',
|
||||
docID: 'helpEventsArchiveDate',
|
||||
isDatepicker: true
|
||||
}
|
||||
|
|
@ -173,21 +165,16 @@
|
|||
});
|
||||
|
||||
$.ajax({
|
||||
|
||||
url: createURL("archiveEvents"),
|
||||
data: data,
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
|
||||
success: function(data) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
// Reloads window with events removed
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -269,17 +256,6 @@
|
|||
return true;
|
||||
}
|
||||
}
|
||||
/*
|
||||
,
|
||||
startdate: {
|
||||
label: 'Start Date',
|
||||
isDatepicker: true
|
||||
},
|
||||
enddate: {
|
||||
label: 'End Date',
|
||||
isDatepicker: true
|
||||
}
|
||||
*/
|
||||
},
|
||||
|
||||
dataProvider: function(args) {
|
||||
|
|
@ -317,9 +293,8 @@
|
|||
$.ajax({
|
||||
url: createURL("deleteEvents&ids=" + args.context.events[0].id),
|
||||
success: function(json) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -342,16 +317,10 @@
|
|||
$.ajax({
|
||||
url: createURL("archiveEvents&ids=" + args.context.events[0].id),
|
||||
success: function(json) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
// Reloads window with item archived
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -428,29 +397,29 @@
|
|||
actions: {
|
||||
// Remove multiple Alerts
|
||||
remove: {
|
||||
label: 'Delete Alerts',
|
||||
label: 'label.delete.alerts',
|
||||
isHeader: true,
|
||||
addRow: false,
|
||||
messages: {
|
||||
notification: function(args) {
|
||||
return 'Alerts Deleted';
|
||||
return 'label.delete.alerts';
|
||||
}
|
||||
},
|
||||
createForm: {
|
||||
title: 'Delete Alerts',
|
||||
title: 'label.delete.alerts',
|
||||
desc: '',
|
||||
fields: {
|
||||
type: {
|
||||
label: 'By Alert type',
|
||||
label: 'label.by.alert.type',
|
||||
docID: 'helpAlertsDeleteType'
|
||||
},
|
||||
startdate: {
|
||||
label: 'By date (start date)',
|
||||
label: 'label.by.date.start',
|
||||
docID: 'helpAlertsDeleteDate',
|
||||
isDatepicker: true
|
||||
},
|
||||
enddate: {
|
||||
label: 'By date (end than)',
|
||||
label: 'label.by.date.end',
|
||||
docID: 'helpAlertsDeleteDate',
|
||||
isDatepicker: true
|
||||
}
|
||||
|
|
@ -476,48 +445,43 @@
|
|||
});
|
||||
|
||||
$.ajax({
|
||||
|
||||
url: createURL("deleteAlerts"),
|
||||
data: data,
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
|
||||
success: function(data) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
}
|
||||
});
|
||||
// Reloads window with events removed
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
},
|
||||
|
||||
// Archive multiple Alerts
|
||||
archive: {
|
||||
label: 'Archive Alerts',
|
||||
label: 'label.archive.alerts',
|
||||
isHeader: true,
|
||||
addRow: false,
|
||||
messages: {
|
||||
notification: function(args) {
|
||||
return 'Alerts Archived';
|
||||
return 'label.archive.alerts';
|
||||
}
|
||||
},
|
||||
createForm: {
|
||||
title: 'Archive Alerts',
|
||||
title: 'label.archive.alerts',
|
||||
desc: '',
|
||||
fields: {
|
||||
type: {
|
||||
label: 'By Alert type',
|
||||
label: 'label.by.alert.type',
|
||||
docID: 'helpAlertsArchiveType'
|
||||
},
|
||||
startdate: {
|
||||
label: 'By date (start date)',
|
||||
label: 'label.by.date.start',
|
||||
docID: 'helpAlertsArchiveDate',
|
||||
isDatepicker: true
|
||||
},
|
||||
enddate: {
|
||||
label: 'By date (end date)',
|
||||
label: 'label.by.date.end',
|
||||
docID: 'helpAlertsArchiveDate',
|
||||
isDatepicker: true
|
||||
}
|
||||
|
|
@ -543,24 +507,17 @@
|
|||
});
|
||||
|
||||
$.ajax({
|
||||
|
||||
url: createURL("archiveAlerts"),
|
||||
data: data,
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
|
||||
success: function(data) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
// Reloads window with events removed
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
dataProvider: function(args) {
|
||||
|
|
@ -599,13 +556,10 @@
|
|||
$.ajax({
|
||||
url: createURL("deleteAlerts&ids=" + args.context.alerts[0].id),
|
||||
success: function(json) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
|
||||
});
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
|
||||
}
|
||||
},
|
||||
|
|
@ -625,16 +579,10 @@
|
|||
$.ajax({
|
||||
url: createURL("archiveAlerts&ids=" + args.context.alerts[0].id),
|
||||
success: function(json) {
|
||||
|
||||
args.response.success();
|
||||
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
// Reloads window with item archived
|
||||
$(window).trigger('cloudStack.fullRefresh');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue