modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 8 ++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
| 9 ++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 81107aa666cf2cefad89fa58aff81085ef064ac0
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 24 16:46:43 2010 -0500
Fixed regression in Group TitleBar code when dealing with AutoGroups.
When criteria fetching an autoroups (private) backing group you need to
add additional criteria.
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 b41be2b..8fa66f3 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
@@ -137,7 +137,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
@Override
protected ResourceGroupTitleBar createTitleBar() {
- return new ResourceGroupTitleBar(getLocatorId());
+ return new ResourceGroupTitleBar(getLocatorId(), isAutoGroup());
}
protected List<TwoLevelTab> createTabs() {
@@ -339,7 +339,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
criteria.addFilterId(groupId);
// for autogroups we need to add more criteria
- if (AUTO_GROUP_VIEW_PATH.equals(getBaseViewPath())) {
+ if (isAutoGroup()) {
criteria.addFilterVisible(null);
criteria.addFilterPrivate(true);
}
@@ -363,6 +363,10 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
});
}
+ private boolean isAutoGroup() {
+ return AUTO_GROUP_VIEW_PATH.equals(getBaseViewPath());
+ }
+
private void loadResourceType(final ResourceGroupComposite groupComposite, final
ViewPath viewPath) {
final ResourceGroup group = this.groupComposite.getResourceGroup();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index bdf3fda..333fce6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -57,6 +57,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
private ResourceGroup group;
private ResourceGroupComposite groupComposite;
+ boolean isAutoGroup;
private Img expandCollapseArrow;
private Img badge;
@@ -66,8 +67,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
private boolean favorite;
private GeneralProperties generalProperties;
- public ResourceGroupTitleBar(String locatorId) {
+ public ResourceGroupTitleBar(String locatorId, boolean isAutoGroup) {
super(locatorId);
+ this.isAutoGroup = isAutoGroup;
setWidth100();
setHeight(30);
setPadding(5);
@@ -100,6 +102,11 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM);
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
criteria.addFilterId(this.group.getId());
+ // for autogroups we need to add more criteria
+ if (isAutoGroup) {
+ criteria.addFilterVisible(null);
+ criteria.addFilterPrivate(true);
+ }
GWTServiceLookup.getResourceGroupService().findResourceGroupCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceGroupComposite>>() {
@Override
Show replies by date