From b67e49d8ce297f8371bccdf7ad3c98ecd90e228b Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Mon, 11 Feb 2013 11:45:34 -0800 Subject: [PATCH] Conditionally load plugin section If no UI plugins are loaded via plugins.js, then hide 'plugins' section, to avoid confusion due to a blank plugin page. --- ui/scripts/cloudStack.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index fc8578801d9..7456ef59ddf 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -19,18 +19,26 @@ home: 'dashboard', sectionPreFilter: function(args) { + var sections = []; + if(isAdmin()) { - return ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "system", "global-settings", "configuration", "projects", "plugins"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "system", "global-settings", "configuration", "projects"]; } else if(isDomainAdmin()) { - return ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects"]; } else if (g_userProjectsEnabled) { - return ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects"]; } else { //normal user - return ["dashboard", "instances", "storage", "network", "templates", "accounts", "events"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events"]; } + + if (cloudStack.plugins.length) { + sections.push('plugins'); + } + + return sections; }, sections: { /**