Updated Branches: refs/heads/4.2 46fcb03f1 -> 73786c373
CLOUDSTACK-3253: Don't allow default ACL lists to be removed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73786c37 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73786c37 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73786c37 Branch: refs/heads/4.2 Commit: 73786c373a83c845f929ff7d57221201571fe213 Parents: 46fcb03 Author: Brian Federle <[email protected]> Authored: Mon Jul 8 14:22:50 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Mon Jul 8 14:23:18 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73786c37/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index d5a02f6..edf0869 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -1115,7 +1115,7 @@ data: items, actionFilter: function(args) { var allowedActions = []; - if(isAdmin()) { + if(isAdmin() && items.vpcid) { allowedActions.push("remove"); }
