CLOUDSTACK-8621: Allow UI plugins to be shown on navigation bar

yadvr · yadvr · commit 4de4a0f3dd8d · 2015-07-09T15:26:00.000+05:30
Introduces a boolean option in UI plugins setting it to 'true' would display the UI plugin on the left navigation bar. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> This closes apache#563 (cherry picked from commit 7c206c3) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/ui/plugins/testPlugin/testPlugin.js b/ui/plugins/testPlugin/testPlugin.js
@@ -19,6 +19,7 @@
     plugin.ui.addSection({
       id: 'testPlugin',
       title: 'TestPlugin',
+      showOnNavigation: true,
       preFilter: function(args) {
         return isAdmin();
       },
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
@@ -31,9 +31,12 @@
                 sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "regions", "affinityGroups"];
             }
 
-            if (cloudStack.plugins.length) {
-                sections.push('plugins');
-            }
+            $.each(cloudStack.plugins, function(idx, plugin) {
+                if (cloudStack.sections.hasOwnProperty(plugin) && !cloudStack.sections[plugin].showOnNavigation) {
+                    sections.push('plugins');
+                    return false;
+                }
+            });
 
             return sections;
         },
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
@@ -61,7 +61,7 @@
                 );
             }
 
-            if (args.isPlugin) {
+            if (args.isPlugin && !args.showOnNavigation) {
                 $li.hide();
             }
 
@@ -88,7 +88,7 @@
             return $(this).hasClass(sectionID);
         });
         var data = args.sections[sectionID];
-        var isPlugin = data.isPlugin;
+        var isPlugin = data.isPlugin && !data.showOnNavigation;
 
         data.$browser = $browser;
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`
`64`		`- if (args.isPlugin) {`
	`64`	`+ if (args.isPlugin && !args.showOnNavigation) {`
`65`	`65`	`$li.hide();`
`66`	`66`	`}`
`67`	`67`
`@@ -88,7 +88,7 @@`
`88`	`88`	`return $(this).hasClass(sectionID);`
`89`	`89`	`});`
`90`	`90`	`var data = args.sections[sectionID];`
`91`		`- var isPlugin = data.isPlugin;`
	`91`	`+ var isPlugin = data.isPlugin && !data.showOnNavigation;`
`92`	`92`
`93`	`93`	`data.$browser = $browser;`
`94`	`94`