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 541D9F2B9 for ; Mon, 25 Mar 2013 17:52:07 +0000 (UTC) Received: (qmail 31778 invoked by uid 500); 25 Mar 2013 17:52:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 31703 invoked by uid 500); 25 Mar 2013 17:52:02 -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 30941 invoked by uid 99); 25 Mar 2013 17:52: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, 25 Mar 2013 17:52:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6417E820026; Mon, 25 Mar 2013 17:52: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 Date: Mon, 25 Mar 2013 17:52:12 -0000 Message-Id: <286b344af40c48a393ebd16e3f6219c1@git.apache.org> In-Reply-To: <5642616fa1734ce7b376ffebf7163ad3@git.apache.org> References: <5642616fa1734ce7b376ffebf7163ad3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/50] [abbrv] git commit: refs/heads/ui-multiple-pod-ranges - CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - remove region field from Add Account dialog since createAccount API does not take in regionid parameter. CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - remove region field from Add Account dialog since createAccount API does not take in regionid parameter. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9270b433 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9270b433 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9270b433 Branch: refs/heads/ui-multiple-pod-ranges Commit: 9270b4335c12e410be52092b02da723b1a0c7b5b Parents: 5a9ccce Author: Jessica Wang Authored: Wed Mar 20 16:47:52 2013 -0700 Committer: Jessica Wang Committed: Wed Mar 20 16:47:52 2013 -0700 ---------------------------------------------------------------------- ui/scripts/accounts.js | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9270b433/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 3727f8e..3403337 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -112,32 +112,7 @@ label: 'label.last.name', validation: { required: true }, docID: 'helpAccountLastName' - }, - regionid: { - label: 'label.region', - select: function(args) { - $.ajax({ - url: createURL('listRegions&listAll=true'), - success: function(json) { - var regions = json.listregionsresponse.region; - var regionOptions; - - if (!regions) { - regionOptions = [{ id: 0, description: '0 - Default' }]; - } else { - regionOptions = $(regions).map(function(index, region) { - return { - id: region.id, - description: region.id + ' - ' + region.name - }; - }); - } - - args.response.success({ data: regionOptions }); - } - }); - } - }, + }, domainid: { label: 'label.domain', docID: 'helpAccountDomain', @@ -220,8 +195,7 @@ $.extend(data, { email: args.data.email, firstname: args.data.firstname, - lastname: args.data.lastname, - regionid: args.data.regionid, + lastname: args.data.lastname, domainid: args.data.domainid }); @@ -316,8 +290,7 @@ domainid: accountObj.domainid, account: accountObj.name, newname: args.data.name, - networkdomain: args.data.networkdomain, - regionid: accountObj.regionid ? accountObj.regionid : 0 + networkdomain: args.data.networkdomain }; $.ajax({ @@ -660,8 +633,7 @@ converter: function(args){ return cloudStack.converters.toRole(args); } - }, - regionid: { label: 'label.region' }, + }, domain: { label: 'label.domain' }, state: { label: 'label.state' }, networkdomain: {