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 0F17C10861 for ; Mon, 22 Jul 2013 23:53:02 +0000 (UTC) Received: (qmail 12968 invoked by uid 500); 22 Jul 2013 23:53:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 12936 invoked by uid 500); 22 Jul 2013 23:53:01 -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 12929 invoked by uid 99); 22 Jul 2013 23:53:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 23:53:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 98B5F8B1425; Mon, 22 Jul 2013 23:53:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Message-Id: <776cbd67f97742b7b9f3fb42d62b3f11@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 2eae870 Date: Mon, 22 Jul 2013 23:53:01 +0000 (UTC) Updated Branches: refs/heads/4.2 df3ae9805 -> 2eae87033 CLOUDSTACK-3660: Add isdynamicallyscalable field Add isdynamicallyscalable field to storage -> create template dialog Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2eae8703 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2eae8703 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2eae8703 Branch: refs/heads/4.2 Commit: 2eae8703354dfbf74c5855ad9d11375805797dfb Parents: df3ae98 Author: Brian Federle Authored: Mon Jul 22 16:52:37 2013 -0700 Committer: Brian Federle Committed: Mon Jul 22 16:52:50 2013 -0700 ---------------------------------------------------------------------- ui/scripts/storage.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2eae8703/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 348ba7b..5e1c225 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1075,6 +1075,10 @@ isFeatured: { label: "label.featured", isBoolean: true + }, + isdynamicallyscalable: { + label: "Dynamically Scalable", + isBoolean: true } } }, @@ -1085,7 +1089,9 @@ displayText: args.data.displayText, osTypeId: args.data.osTypeId, isPublic: (args.data.isPublic == "on"), - passwordEnabled: (args.data.isPasswordEnabled == "on") + passwordEnabled: (args.data.isPasswordEnabled == "on"), + isdynamicallyscalable: (args.data.isdynamicallyscalable == "on") + }; if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") { @@ -1660,6 +1666,10 @@ isPasswordEnabled: { label: 'label.password.enabled', isBoolean: true + }, + isdynamicallyscalable: { + label: "Dynamically Scalable", + isBoolean: true } } }, @@ -1670,7 +1680,8 @@ displayText: args.data.displayText, osTypeId: args.data.osTypeId, isPublic: (args.data.isPublic == "on"), - passwordEnabled: (args.data.isPasswordEnabled == "on") + passwordEnabled: (args.data.isPasswordEnabled == "on"), + isdynamicallyscalable: (args.data.isdynamicallyscalable == "on") }; $.ajax({