[rhq] Branch 'release/jon3.1.x' - modules/enterprise
Jiri Kremser
jkremser at fedoraproject.org
Thu Aug 9 12:25:14 UTC 2012
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 14 ++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java | 28 ++--------
2 files changed, 19 insertions(+), 23 deletions(-)
New commits:
commit 0855639970da484fa6ee9782edabb47184aca138
Author: Jirka Kremser <jkremser at redhat.com>
Date: Thu Aug 9 13:12:03 2012 +0200
[BZ 822795 - Search filter not working in bundle deployment wizard] Added filtering by the name of the bundle.
(cherry picked from commit 21e61a1588663c97975580003c00dfd8cbc20798)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
index fd1a659..a072b80 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
@@ -75,7 +76,7 @@ public class BundleSelector extends AbstractSelector<Bundle, BundleCriteria> {
}
protected RPCDataSource<Bundle, BundleCriteria> getDataSource() {
- return new BundlesDataSource();
+ return new SelectedBundlesDataSource();
}
protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
@@ -93,4 +94,15 @@ public class BundleSelector extends AbstractSelector<Bundle, BundleCriteria> {
protected String getItemTitle() {
return MSG.common_title_bundles();
}
+
+ public class SelectedBundlesDataSource extends BundlesDataSource {
+ @Override
+ protected BundleCriteria getFetchCriteria(final DSRequest request) {
+ BundleCriteria result = super.getFetchCriteria(request);
+ if (null != result) {
+ result.setStrict(false);
+ }
+ return result;
+ }
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java
index f8389b4..42a3e0d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java
@@ -90,28 +90,12 @@ public class BundlesDataSource extends RPCDataSource<Bundle, BundleCriteria> {
@Override
protected BundleCriteria getFetchCriteria(final DSRequest request) {
BundleCriteria criteria = new BundleCriteria();
-
- if (request.getCriteria().getValues().get("tagNamespace") != null) {
- criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
- }
-
- if (request.getCriteria().getValues().get("tagSemantic") != null) {
- criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
- }
-
- if (request.getCriteria().getValues().get("tagName") != null) {
- criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
- }
-
- if (request.getCriteria().getValues().get("bundleType") != null) {
- criteria.addFilterBundleTypeId(Integer.valueOf(request.getCriteria().getValues().get("bundleType")
- .toString()));
- }
-
- // TODO: this doesn't work like I think it should, figure out how to search on the name column
- // if (request.getCriteria().getValues().get("search") != null) {
- // criteria.setSearchExpression(request.getCriteria().getValues().get("search").toString());
- // }
+ criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class));
+ criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class));
+ criteria.addFilterTagName(getFilter(request, "tagName", String.class));
+ criteria.addFilterBundleTypeId(getFilter(request, "bundleType", Integer.class));
+ criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class));
+ criteria.addFilterName(getFilter(request, "search", String.class));
return criteria;
}
More information about the rhq-commits
mailing list