etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.9'

This commit is contained in:
Rohit Yadav 2016-11-01 14:07:53 +05:30
parent 054a7178e0 305400b7b9
commit 8339fa0809
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ui/scripts/metrics.js
View File

@ -358,9 +358,19 @@
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
if ("zones" in args.context && args.context.zones[0]) {
data['zoneid'] = args.context.zones[0].id;
}
if ("pods" in args.context && args.context.pods[0]) {
data['podid'] = args.context.pods[0].id;
}
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listClusters'),
data: data,
@ -636,9 +646,29 @@
var data = {};
data.type = 'routing';
listViewDataProvider(args, data);
if (!args.context.instances) {
if ("zones" in args.context && args.context.zones[0]) {
data['zoneid'] = args.context.zones[0].id;
}
if ("pods" in args.context && args.context.pods[0]) {
data['podid'] = args.context.pods[0].id;
}
if ("clusters" in args.context && args.context.clusters[0]) {
data['clusterid'] = args.context.clusters[0].id;
}
} else {
if (args.context.instances[0]) {
data['id'] = args.context.instances[0].hostid;
}
}
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listHosts'),
data: data,
@ -859,9 +889,15 @@
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
if ("hosts" in args.context && args.context.hosts[0]) {
data['hostid'] = args.context.hosts[0].id;
}
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listVirtualMachines'),
data: data,
@ -958,9 +994,19 @@
dataProvider: function(args) {
var data = {listAll: true};
listViewDataProvider(args, data);
if ("instances" in args.context && args.context.instances[0]) {
data['virtualmachineid'] = args.context.instances[0].id;
}
if ("primarystorages" in args.context && args.context.primarystorages[0]) {
data['storageid'] = args.context.primarystorages[0].id;
}
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listVolumes'),
data: data,
@ -1060,9 +1106,23 @@
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
if ("zones" in args.context && args.context.zones[0]) {
data['zoneid'] = args.context.zones[0].id;
}
if ("pods" in args.context && args.context.pods[0]) {
data['podid'] = args.context.pods[0].id;
}
if ("clusters" in args.context && args.context.clusters[0]) {
data['clusterid'] = args.context.clusters[0].id;
}
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listStoragePools'),
data: data,

23
ui/scripts/system.js
View File

@ -2585,6 +2585,11 @@
label: 'label.destroy.router',
messages: {
confirm: function (args) {
if (args && args.context && args.context.routers[0]) {
if (args.context.routers[0].state == 'Running') {
return dictionary['message.action.stop.router'] + ' ' + dictionary['message.confirm.destroy.router'];
}
}
return 'message.confirm.destroy.router';
},
notification: function (args) {
@ -3752,6 +3757,11 @@
label: 'label.destroy.router',
messages: {
confirm: function (args) {
if (args && args.context && args.context.routers[0]) {
if (args.context.routers[0].state == 'Running') {
return dictionary['message.action.stop.router'] + ' ' + dictionary['message.confirm.destroy.router'];
}
}
return 'message.confirm.destroy.router';
},
notification: function (args) {
@ -6674,6 +6684,11 @@
label: 'label.destroy.router',
messages: {
confirm: function (args) {
if (args && args.context && args.context.routers[0]) {
if (args.context.routers[0].state == 'Running') {
return dictionary['message.action.stop.router'] + ' ' + dictionary['message.confirm.destroy.router'];
}
}
return 'message.confirm.destroy.router';
},
notification: function (args) {
@ -9915,6 +9930,11 @@
label: 'label.destroy.router',
messages: {
confirm: function (args) {
if (args && args.context && args.context.routers[0]) {
if (args.context.routers[0].state == 'Running') {
return dictionary['message.action.stop.router'] + ' ' + dictionary['message.confirm.destroy.router'];
}
}
return 'message.confirm.destroy.router';
},
notification: function (args) {
@ -21595,8 +21615,9 @@
}
allowedActions.push("restart");
allowedActions.push("remove");
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {