Bug 1144046 - Uncaught exception when selecting Administration -> Security

Libor Zoubek · Libor Zoubek · commit 14603d2f8e61 · 2014-09-18T16:48:11.000+02:00
menu item

MenuItems directly under Administration now target to leaf views (usually
it's the first child view which does not require special permissions)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/view/ViewName.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/view/ViewName.java
@@ -37,6 +37,10 @@ public ViewName(String name, String title, IconEnum icon) {
         this.icon = icon;
     }
 
+    public ViewName withTitle(String title) {
+        this.title = title;
+        return this;
+    }
 
     private static String buildTitle(String name, String title) {
         return (null == title || "".equals(title.trim())) ? StringUtils.deCamelCase(name) : title;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
@@ -129,20 +129,24 @@ public class MenuBarView extends EnhancedVLayout {
         new MenuItem(BundleTopView.VIEW_ID),
         new MenuItem(AdministrationView.VIEW_ID)
             .subItems(
-                new MenuItem(AdministrationView.SECTION_SECURITY_VIEW_ID,AdministrationView.VIEW_ID)
+            new MenuItem(UsersView.VIEW_ID.withTitle(AdministrationView.SECTION_SECURITY_VIEW_ID.getTitle()),
+                AdministrationView.VIEW_ID, AdministrationView.SECTION_SECURITY_VIEW_ID)
                 .subItems(
                     new MenuItem(UsersView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_SECURITY_VIEW_ID),
                     new MenuItem(RolesView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_SECURITY_VIEW_ID)
                  ),
-                new MenuItem(AdministrationView.SECTION_TOPOLOGY_VIEW_ID,Permission.MANAGE_SETTINGS,AdministrationView.VIEW_ID)
+                 new MenuItem(ServerTableView.VIEW_ID.withTitle(AdministrationView.SECTION_TOPOLOGY_VIEW_ID.getTitle()),
+                     AdministrationView.VIEW_ID, AdministrationView.SECTION_TOPOLOGY_VIEW_ID)
                     .subItems(
                         new MenuItem(ServerTableView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_TOPOLOGY_VIEW_ID),
                         new MenuItem(StorageNodeAdminView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_TOPOLOGY_VIEW_ID),
                         new MenuItem(AgentTableView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_TOPOLOGY_VIEW_ID),
                         new MenuItem(AffinityGroupTableView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_TOPOLOGY_VIEW_ID),
                         new MenuItem(PartitionEventTableView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_TOPOLOGY_VIEW_ID)
                      ),
-                new MenuItem(AdministrationView.SECTION_CONFIGURATION_VIEW_ID,AdministrationView.VIEW_ID)
+                 new MenuItem(
+                     DownloadsView.VIEW_ID.withTitle(AdministrationView.SECTION_CONFIGURATION_VIEW_ID.getTitle()),
+                     Permission.MANAGE_SETTINGS, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONFIGURATION_VIEW_ID)
                     .subItems(
                         new MenuItem(SystemSettingsView.VIEW_ID,Permission.MANAGE_SETTINGS, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONFIGURATION_VIEW_ID),
                         new MenuItem(AlertDefinitionTemplateTypeView.VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONFIGURATION_VIEW_ID),
@@ -154,7 +158,9 @@ public class MenuBarView extends EnhancedVLayout {
                         new MenuItem(AgentPluginTableView.VIEW_ID, Permission.MANAGE_SETTINGS, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONFIGURATION_VIEW_ID),
                         new MenuItem(ServerPluginTableView.VIEW_ID, Permission.MANAGE_SETTINGS, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONFIGURATION_VIEW_ID)
                     ),
-                new MenuItem(AdministrationView.SECTION_CONTENT_VIEW_ID,AdministrationView.VIEW_ID)
+                new MenuItem(
+                    AdministrationView.PAGE_REPOS_VIEW_ID.withTitle(AdministrationView.SECTION_CONTENT_VIEW_ID.getTitle()),
+                    Permission.MANAGE_REPOSITORIES, AdministrationView.VIEW_ID, AdministrationView.SECTION_CONTENT_VIEW_ID)
                     .subItems(
                         new MenuItem(AdministrationView.PAGE_CONTENT_SOURCES_VIEW_ID, Permission.MANAGE_REPOSITORIES, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONTENT_VIEW_ID),
                         new MenuItem(AdministrationView.PAGE_REPOS_VIEW_ID, AdministrationView.VIEW_ID,AdministrationView.SECTION_CONTENT_VIEW_ID)

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ public ViewName(String name, String title, IconEnum icon) {`
`37`	`37`	`this.icon = icon;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public ViewName withTitle(String title) {`
	`41`	`+ this.title = title;`
	`42`	`+ return this;`
	`43`	`+ }`
`40`	`44`
`41`	`45`	`private static String buildTitle(String name, String title) {`
`42`	`46`	`return (null == title \|\| "".equals(title.trim())) ? StringUtils.deCamelCase(name) : title;`