modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 2 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit e1b12455724418abfbb47f004d907faf2f052eeb Author: John Mazzitelli mazz@redhat.com Date: Mon Mar 28 12:43:00 2011 -0400
BZ 535384 - criteria needed to add search expression from the filter field in order for the search bar to work for any view using this ResourceComposite data source I also added the ability to set version criteria, to match that of the Resouce datasource.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java index 24eb534..0567d7c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java @@ -173,6 +173,8 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); + criteria.addFilterVersion(getFilter(request, "version", String.class)); + criteria.setSearchExpression(getFilter(request, "search", String.class));
return criteria; }
commit c510a0e9ae1c21c63d66d6420b01fbeb65b50e22 Author: John Mazzitelli mazz@redhat.com Date: Mon Mar 28 11:16:17 2011 -0400
remove unused static API. we have a different way of getting group member views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java index 7e9883e..617ca08 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java @@ -175,10 +175,4 @@ public class ResourceCompositeSearchView extends ResourceSearchView { return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new Criteria("parentId", String .valueOf(parentResourceComposite.getResource().getId())), MSG.view_inventory_resources_title_children()); } - - public static ResourceCompositeSearchView getMembersOf(String locatorId, int groupId) { - return new ResourceCompositeSearchView(locatorId, (ResourceComposite) null, new Criteria("groupId", String - .valueOf(groupId)), MSG.view_inventory_resources_title_members()); - } - }
rhq-commits@lists.fedorahosted.org