modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
| 10 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit a354a40c418369af69b6ed6fb929510254117a69
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 22 15:01:01 2010 -0500
These classes were failing to get the proper Global Perms for the
user after the switch to UserPermissionsManager. Updated to use the
proper mechanism and now tab activation seems to be working correctly.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 9897828..3226afe 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -234,6 +234,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
((TwoLevelTab) top).getLayout().destroyViews();
}
+ Set<Permission> globalPermissions =
UserPermissionsManager.getInstance().getGlobalPermissions();
GroupCategory groupCategory =
groupComposite.getResourceGroup().getGroupCategory();
Set<ResourceTypeFacet> facets =
groupComposite.getResourceFacets().getFacets();
@@ -279,7 +280,6 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.inventoryTab, this.inventoryConnHistory, new
HistoryGroupPluginConfigurationView(
this.inventoryConnHistory.extendLocatorId("View"),
this.groupComposite), facets
.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true);
- Set<Permission> globalPermissions =
this.groupComposite.getResourcePermission().getPermissions();
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new
ResourceGroupMembershipView(this.inventoryMembership.extendLocatorId("View"),
groupId)
: null;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 190dda3..35a929b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -236,6 +236,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
((TwoLevelTab) top).getLayout().destroyViews();
}
+ Set<Permission> globalPermissions =
UserPermissionsManager.getInstance().getGlobalPermissions();
ResourcePermission resourcePermissions =
this.resourceComposite.getResourcePermission();
Set<ResourceTypeFacet> facets =
this.resourceComposite.getResourceFacets().getFacets();
@@ -297,7 +298,6 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.inventoryTab, this.inventoryGroups,
ResourceGroupListView.getGroupsOf(this.inventoryTab
.extendLocatorId("GroupsView"), resource.getId()), true, true);
- Set<Permission> globalPermissions =
this.resourceComposite.getResourcePermission().getPermissions();
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new
ResourceResourceGroupsView(this.inventoryTab.extendLocatorId("GroupMembershipView"),
resourceId) : null;
commit 6346a259a93c138537ecc4d75f91d3d742ad606e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 22 14:58:30 2010 -0500
minor - Add NamedTabSet.getTabByTitle as an improvement to falling through
to super's impl
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
index e7d4a98..494f815 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
@@ -42,4 +42,14 @@ public class NamedTabSet extends LocatableTabSet {
return null;
}
+ public NamedTab getTabByTitle(String title) {
+ NamedTab[] tabs = getTabs();
+ for (NamedTab tab : tabs) {
+ if (tab.getTitle().equals(title)) {
+ return tab;
+ }
+ }
+ return null;
+ }
+
}
Show replies by date