cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to d3af2de
Date Wed, 08 Oct 2014 22:02:27 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f96c65416 -> d3af2de73


CLOUDSTACK-7661: UI > VM Wizard > Keyboard Language > send new parameter keyboard
to deployVirtualMachine API call.


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

Branch: refs/heads/master
Commit: d3af2de73041f81acfdf1b2f95a3d81727389c14
Parents: f96c654
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Oct 8 15:02:01 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Oct 8 15:02:16 2014 -0700

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3af2de7/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 2a79ef0..3a588e7 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -940,7 +940,14 @@
             		group : group
             	});
             }
-
+            
+            var keyboard = args.data.keyboardLanguage;
+            if (keyboard != null && keyboard.length > 0) {  //when blank option
(default option) is selected => args.data.keyboardLanguage == ""              
+            	$.extend(deployVmData, {
+            		keyboard : keyboard
+            	});
+            }            
+            
             $(window).trigger('cloudStack.deployVirtualMachine', {
                 deployVmData: deployVmData,
                 formData: args.data


Mime
View raw message