cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [37/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:41:54 GMT
CLOUDSTACK-7661: UI > VM Wizard > Keyboard Language > send new parameter keyboard
to deployVirtualMachine API call.

(cherry picked from commit d3af2de73041f81acfdf1b2f95a3d81727389c14)


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

Branch: refs/heads/4.5
Commit: 70f74eeb2a8239cc7410b9b2d8f76785b02fccee
Parents: dfdf9ed
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Oct 8 15:02:01 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:35:45 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70f74eeb/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