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 97D3A101EC for ; Fri, 26 Apr 2013 18:28:25 +0000 (UTC) Received: (qmail 33991 invoked by uid 500); 26 Apr 2013 18:28:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33977 invoked by uid 500); 26 Apr 2013 18:28:25 -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 33970 invoked by uid 99); 26 Apr 2013 18:28:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 18:28:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2FBDA8822C5; Fri, 26 Apr 2013 18:28:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <31b8f4bd0d23428498a5cb8e74b27e8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 3e2eb59 Date: Fri, 26 Apr 2013 18:28:25 +0000 (UTC) Updated Branches: refs/heads/master 7cf312a77 -> 3e2eb5972 CLOUDSTACK-2120: mixed zone management - UI: make global function changeURL() to pass zonetype to API calls based on selected option in zone type dropdown on top menu. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e2eb597 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e2eb597 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e2eb597 Branch: refs/heads/master Commit: 3e2eb59723f6aa58170e8650ca8ef03a8b2d6b45 Parents: 7cf312a Author: Jessica Wang Authored: Fri Apr 26 11:26:21 2013 -0700 Committer: Jessica Wang Committed: Fri Apr 26 11:26:21 2013 -0700 ---------------------------------------------------------------------- ui/scripts/sharedFunctions.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e2eb597/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 7467531..a018406 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -114,6 +114,10 @@ function createURL(apiName, options) { if (cloudStack.context && cloudStack.context.projects && !options.ignoreProject) { urlString = urlString + '&projectid=' + cloudStack.context.projects[0].id; } + + if(cloudStack.context != null && cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type + urlString = urlString + '&zonetype=' + cloudStack.context.zoneType; + } return urlString; }