From 5fb518662fac98c613cbd7e286a50450bf2fc2bf Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Fri, 2 Dec 2011 13:26:15 -0800 Subject: [PATCH] bug 12263: Remove 'all zones' select when in project view --- ui/scripts/templates.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 6414bbce43b..0f432d706ee 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -70,7 +70,8 @@ success: function(json) { var zoneObjs = json.listzonesresponse.zone; var items = []; - if (isAdmin()) + if (isAdmin() && !(cloudStack.context.projects && + cloudStack.context.projects[0])) items.push({id: -1, description: "All Zones"}); $(zoneObjs).each(function() { items.push({id: this.id, description: this.name}); @@ -775,7 +776,8 @@ success: function(json) { var zoneObjs = json.listzonesresponse.zone; var items = []; - if (isAdmin()) + if (isAdmin() && !(cloudStack.context.projects && + cloudStack.context.projects[0])) items.push({id: -1, description: "All Zones"}); $(zoneObjs).each(function() { items.push({id: this.id, description: this.name});