You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/10/03 08:06:23 UTC
[25/50] git commit: updated refs/heads/4.2 to 86c9363
CLOUDSTACK-2180: UI > Instances ? Reboot VM action > if the template from which vm is created is password-enabled, pop up "Password has been reset to xxxxxxx" dialog after action is complete.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35e50761
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35e50761
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35e50761
Branch: refs/heads/4.2
Commit: 35e50761562fc558ec7e272cc7dbd1cff564d356
Parents: 38bbfdc
Author: Jessica Wang <je...@apache.org>
Authored: Mon Sep 23 11:57:10 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Sep 23 11:58:21 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35e50761/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index cf8aca5..a9f6d1c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -458,6 +458,12 @@
},
notification: function(args) {
return 'label.action.reboot.instance';
+ },
+ complete: function(args) {
+ if (args.password != null && args.password.length > 0)
+ return 'Password has been reset to ' + args.password;
+ else
+ return null;
}
},
notification: {