Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD49917733 for ; Thu, 16 Oct 2014 13:25:41 +0000 (UTC) Received: (qmail 64917 invoked by uid 500); 16 Oct 2014 13:25:34 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 64865 invoked by uid 500); 16 Oct 2014 13:25:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 64199 invoked by uid 99); 16 Oct 2014 13:25:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 13:25:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 08E979ADED3; Thu, 16 Oct 2014 13:25:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 16 Oct 2014 13:25:50 -0000 Message-Id: In-Reply-To: <613e1faf1a374433b2613446fb63a1e7@git.apache.org> References: <613e1faf1a374433b2613446fb63a1e7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] git commit: updated refs/heads/master to 7072d8d 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/master Commit: 70f74eeb2a8239cc7410b9b2d8f76785b02fccee Parents: dfdf9ed Author: Jessica Wang Authored: Wed Oct 8 15:02:01 2014 -0700 Committer: David Nalley 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