cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [19/50] [abbrv] git commit: updated refs/heads/master to b61733d
Date Mon, 08 Dec 2014 10:09:07 GMT
Deploy vm to specified host through Infrastructure -> Hosts -> <Select one> ->
View Instances -> Add Instance
(cherry picked from commit ce2b2a1fc7c4b018bde11385c25b5a41333b2312)


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

Branch: refs/heads/master
Commit: bf9e1ae7e80d143728c8f53633eb82521a003ddb
Parents: 513adab
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Mon Dec 1 14:47:06 2014 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Mon Dec 1 14:50:01 2014 +0100

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js  | 8 +++++++-
 ui/scripts/instances.js       | 3 +++
 ui/scripts/sharedFunctions.js | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf9e1ae7/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 0baad4f..2a02ad5 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -947,7 +947,13 @@
             		keyboard : keyboard
             	});
             }            
-            
+
+            if (g_hostid != null) {
+                $.extend(deployVmData, {
+                    hostid : g_hostid
+                });
+            }
+ 
             $(window).trigger('cloudStack.deployVirtualMachine', {
                 deployVmData: deployVmData,
                 formData: args.data

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf9e1ae7/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 3d5f9b8..2674804 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -325,9 +325,12 @@
                 }
 
                 if ("hosts" in args.context) {
+                    g_hostid = args.context.hosts[0].id;
                     $.extend(data, {
                         hostid: args.context.hosts[0].id
                     });
+                } else {
+                    g_hostid = null;
                 }
 
                 if ("affinityGroups" in args.context) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf9e1ae7/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 1adab5b..2ab4ca9 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -21,6 +21,7 @@ var g_username = null;
 var g_userid = null;
 var g_account = null;
 var g_domainid = null;
+var g_hostid = null;
 var g_loginCmdText = null;
 var g_enableLogging = false;
 var g_timezoneoffset = null;


Mime
View raw message