cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [5/6] git commit: updated refs/heads/master to 5c48ce9
Date Tue, 10 Nov 2015 11:07:39 GMT
[UI] change alert to ui dialog in response of instance wizard


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/552c08f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/552c08f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/552c08f0

Branch: refs/heads/master
Commit: 552c08f0b47689acc4472c053da064d4fa4ac100
Parents: cb9bf44
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Wed Sep 23 14:59:28 2015 +0200
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Fri Nov 6 13:49:32 2015 +0100

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js | 4 +++-
 ui/scripts/vpc.js            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/552c08f0/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 1401ace..98ac62b 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -1068,7 +1068,9 @@
                             getUpdatedItem: function(json) {
                                 var item = json.queryasyncjobresultresponse.jobresult.virtualmachine;
                                 if (item.password != null)
-                                    alert("Password of new VM " + item.displayname + " is
 " + item.password);
+                                    cloudStack.dialog.notice({
+                                        message: "Password of new VM " + item.displayname
+ " is  " + item.password
+                                    });
                                 return item;
                             },
                             getActionFilter: function() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/552c08f0/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 96bf02f..41d10ed 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1507,7 +1507,9 @@
                             },
                             complete: function(args) {
                                 if (args.password != null) {
-                                    alert('Password of the VM is ' + args.password);
+                                    cloudStack.dialog.notice({
+                                        message: 'Password of the VM is ' + args.password
+                                    });
                                 }
                                 return 'label.action.start.instance';
                             }


Mime
View raw message