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 28D5C1189B for ; Fri, 6 Jun 2014 20:29:16 +0000 (UTC) Received: (qmail 33565 invoked by uid 500); 6 Jun 2014 20:29:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33534 invoked by uid 500); 6 Jun 2014 20:29: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 33527 invoked by uid 99); 6 Jun 2014 20:29:15 -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, 06 Jun 2014 20:29:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A90D18BB096; Fri, 6 Jun 2014 20:29:15 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4-forward to d991e37 Date: Fri, 6 Jun 2014 20:29:15 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward c29ed73d4 -> d991e3786 CLOUDSTACK-6858: UI - remove obsolete variable rootAccountId whose value is no longer 1. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d991e378 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d991e378 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d991e378 Branch: refs/heads/4.4-forward Commit: d991e37865106e79a6a31e4af3a34b2446058eef Parents: c29ed73 Author: Jessica Wang Authored: Fri Jun 6 13:26:53 2014 -0700 Committer: Jessica Wang Committed: Fri Jun 6 13:29:04 2014 -0700 ---------------------------------------------------------------------- ui/scripts/sharedFunctions.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d991e378/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index bec0336..445351a 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -51,8 +51,6 @@ var pageSize = 20; var drModuleIncluded = false; -var rootAccountId = 1; - //async action var pollAsyncJobResult = function(args) { $.ajax({ @@ -1183,10 +1181,7 @@ var addExtraPropertiesToGuestNetworkObject = function(jsonObj) { jsonObj.networkofferingidText = jsonObj.networkofferingid; if (jsonObj.acltype == "Domain") { - if (jsonObj.domainid == rootAccountId) - jsonObj.scope = "All"; - else - jsonObj.scope = "Domain (" + jsonObj.domain + ")"; + jsonObj.scope = "Domain (" + jsonObj.domain + ")"; } else if (jsonObj.acltype == "Account") { if (jsonObj.project != null) jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.project + ")";