[rhq] 2 commits - modules/core modules/enterprise
Jiri Kremser
jkremser at fedoraproject.org
Thu Aug 9 12:00:17 UTC 2012
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java | 2
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 ++--------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 2
4 files changed, 21 insertions(+), 25 deletions(-)
New commits:
commit 58c9ee2d6dd34ebce6b96aed0cbc35da27374165
Author: Jirka Kremser <jkremser at redhat.com>
Date: Thu Aug 9 13:16:53 2012 +0200
Fixing the typo in constructor and bad usage of this constructor in 1 test
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
index 35c9367..84018a8 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java
@@ -95,7 +95,7 @@ public class BundleCriteria extends TaggedCriteria {
}
public void addFilterBundleTypeName(String filterBundleTypeName) {
- this.filterName = filterBundleTypeName;
+ this.filterBundleTypeName = filterBundleTypeName;
}
public void addFilterDescription(String filterDescription) {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
index a4d43b8..1621dac 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
@@ -952,7 +952,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
// return bundle "two" using all criteria and with all optional data
c.addFilterId(b.getId());
c.addFilterName(b.getName());
- c.addFilterBundleTypeName(b.getName());
+ c.addFilterBundleTypeName(b.getBundleType().getName());
c.fetchBundleVersions(true);
c.fetchRepo(true);
bundles = bundleManager.findBundlesByCriteria(overlord, c);
commit 21e61a1588663c97975580003c00dfd8cbc20798
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.
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 037bc10..eaa4371 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;
@@ -76,7 +77,7 @@ public class BundleSelector extends AbstractSelector<Bundle, BundleCriteria> {
}
protected RPCDataSource<Bundle, BundleCriteria> getDataSource() {
- return new BundlesDataSource();
+ return new SelectedBundlesDataSource();
}
protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
@@ -94,4 +95,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