You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/05 00:12:52 UTC
[44/50] [abbrv] git commit: CS-16218: Only show VPC router details
for ROOT admin
CS-16218: Only show VPC router details for ROOT admin
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/eb0caf10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/eb0caf10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/eb0caf10
Branch: refs/heads/4.0
Commit: eb0caf10a222d4bfaedfb482fc631fe237b69b37
Parents: 7272b8d
Author: Brian Federle <br...@citrix.com>
Authored: Thu Aug 30 10:59:07 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Aug 30 11:01:02 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 2 +-
ui/scripts/ui-custom/vpc.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/eb0caf10/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 8d1eb2e..d0f65c4 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3835,7 +3835,7 @@
tabFilter:function(args) {
var hiddenTabs=[];
- var isRouterOwner = isAdmin() || isDomainAdmin();
+ var isRouterOwner = isAdmin();
if(!isRouterOwner)
hiddenTabs.push("router");
return hiddenTabs;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/eb0caf10/ui/scripts/ui-custom/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js
index 4e7b292..2bd26b1 100644
--- a/ui/scripts/ui-custom/vpc.js
+++ b/ui/scripts/ui-custom/vpc.js
@@ -498,7 +498,7 @@
})
});
- if (!isAdmin() && !isDomainAdmin()) $router.addClass('disabled');
+ if (!isAdmin()) $router.addClass('disabled');
var $chart = $('<div>').addClass('vpc-chart');
var $title = $('<div>').addClass('vpc-title')