apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1701 from shapeblue/vr-destroy-ui-allow

Browse Source 
CLOUDSTACK-9534: Allow VR to be destroy in UI when in running stateThis allows us to destroy a VR that is in running state from the UI. This action is possible via cloudmonkey/APIs, and would be useful for anyone who wants to simply destroy a VR from the UI without having to stop it first.

As this is a pure UI fix, manual testing would be needed but no regression integration testing is necessary.
/cc @jburwell @karuturi

@blueorangutan package

Screenshot:

![screenshot from 2016-10-05 18-25-49](https://cloud.githubusercontent.com/assets/95203/19113882/398e8a8e-8b29-11e6-8e99-8f28def2e527.png)

* pr/1701:
  CLOUDSTACK-9534: Allow VR to be destroy in UI when in running state

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-11-01 14:04:58 +05:30
commit 84e282596e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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) {
@ -9830,6 +9845,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) {
@ -20986,8 +21006,9 @@
}
allowedActions.push("restart");
allowedActions.push("remove");
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {