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 28CA3187BC for ; Thu, 28 Jan 2016 12:34:25 +0000 (UTC) Received: (qmail 76096 invoked by uid 500); 28 Jan 2016 12:34:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 76059 invoked by uid 500); 28 Jan 2016 12:34:15 -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 76049 invoked by uid 99); 28 Jan 2016 12:34:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jan 2016 12:34:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B837E006B; Thu, 28 Jan 2016 12:34:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Thu, 28 Jan 2016 12:34:15 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: updated refs/heads/master to e5f0788 Repository: cloudstack Updated Branches: refs/heads/master 5ab82d10d -> e5f0788ed CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templates This commit includes three changes: (1) Revert commit 13bf1ec5da9891eca98ef5dab61bf74b6db9530b to show the 'root disk size' field (2) Set the default value from '1' to empty. This also changes the default value of customized service offerings from '1' to empty. (3) show 'root disk size' field only when users choose a KVM template, as cloudstack supports deployvm with rootdisksize on KVM only. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3822be5a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3822be5a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3822be5a Branch: refs/heads/master Commit: 3822be5a5cf21de2d7578997e3eb63db2562ab75 Parents: 451ae2b Author: Wei Zhou Authored: Fri Jan 15 07:47:47 2016 +0100 Committer: Wei Zhou Committed: Wed Jan 27 23:30:22 2016 +0100 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 2 +- ui/scripts/instanceWizard.js | 4 -- ui/scripts/ui-custom/instanceWizard.js | 55 ++++++++++++++++---- 3 files changed, 47 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3822be5a/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 6cafdb0..bbc85b6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -38,7 +38,7 @@ label.smb.domain=SMB Domain label.hypervisors=Hypervisors label.home=Home label.sockets=CPU Sockets -label.root.disk.size=Root disk size +label.root.disk.size=Root disk size (GB) label.s3.nfs.server=S3 NFS Server label.s3.nfs.path=S3 NFS Path label.delete.events=Delete events http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3822be5a/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 98ac62b..958844e 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -279,10 +279,6 @@ hypervisors: hypervisorObjs }, customHidden: function(args) { - //// - return true; // Disabled -- not supported in backend right now - //// - if (selectedTemplateOrIso == 'select-template') { return false; //show Root Disk Size field } else { //selectedTemplateOrIso == 'select-iso' http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3822be5a/ui/scripts/ui-custom/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index a7ce139..78f781f 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -419,8 +419,6 @@ }); }); - originalValues(formData); - var custom = args.customHidden({ context: context, data: args.data @@ -428,13 +426,52 @@ $step.find('.custom-size-label').remove(); - if (!custom) { - $step.find('.section.custom-size').show(); - $step.addClass('custom-disk-size'); - } else { + if (custom) { $step.find('.section.custom-size').hide(); $step.removeClass('custom-disk-size'); } + + $step.find('input[type=radio]').bind('change', function() { + var $target = $(this); + var val = $target.val(); + var item = null; + if (item == null) { + item = $.grep(args.data.templates.featuredtemplates, function(elem) { + return elem.id == val; + })[0]; + } + if (item == null) { + item = $.grep(args.data.templates.communitytemplates, function(elem) { + return elem.id == val; + })[0]; + } + if (item == null) { + item = $.grep(args.data.templates.mytemplates, function(elem) { + return elem.id == val; + })[0]; + } + if (item == null) { + item = $.grep(args.data.templates.sharedtemplates, function(elem) { + return elem.id == val; + })[0]; + } + + if (!item) return true; + + var hypervisor = item['hypervisor']; + if (hypervisor == 'KVM') { + $step.find('.section.custom-size').show(); + $step.addClass('custom-disk-size'); + } else { + $step.find('.section.custom-size').hide(); + $step.removeClass('custom-disk-size'); + } + + return true; + }); + + originalValues(formData); + } } }; @@ -1271,9 +1308,9 @@ args.maxDiskOfferingSize() : 100; // Setup tabs and slider - $wizard.find('.section.custom-size .size.min span').html(minCustomDiskSize); - $wizard.find('.section.custom-size input[type=text]').val(minCustomDiskSize); - $wizard.find('.section.custom-size .size.max span').html(maxCustomDiskSize); + $wizard.find('.section.custom-size.custom-disk-size .size.min span').html(minCustomDiskSize); + $wizard.find('.section.custom-size.custom-disk-size input[type=text]').val(minCustomDiskSize); + $wizard.find('.section.custom-size.custom-disk-size .size.max span').html(maxCustomDiskSize); $wizard.find('.tab-view').tabs(); $wizard.find('.slider').each(function() { var $slider = $(this);