modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 1 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 32e06f0466e3a6a440518c4bd72e21c012bd6afa Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Dec 6 12:08:35 2011 -0500
[Bug 760209 - Drift Carousel not filtering the drift entries] I think this broke when initial criteria handling changed in the underlying Table implementation. The initial criteria was set correctly but that was no longer applied directly to the grid, instead we now manually perform the initial fetch. But that led to an overriden method getting called to return the current criteria, which had yet to be determined (it was thought to be needed on refresh only). So, the fix was to immediately set the current criteria to the initial criteria in the subclass.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java index 47b5d3d..991ec84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java @@ -71,6 +71,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse
super(locatorId, null, context, hasWriteAccess, initialCriteria);
+ this.carouselCriteria = initialCriteria; this.changeSet = driftChangeSet; ((DriftCarouselDataSource) getDataSource()).setChangeSetId(this.changeSet.getId());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java index 6ccbb17..f941c6f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java @@ -242,7 +242,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi } changeSetCriteria.addFilterStartVersion(String.valueOf(startVersion));
- // apply the drift-level carousel filters in order to filter out changesets that have no applicab;e drift + // apply the drift-level carousel filters in order to filter out changesets that have no applicable drift Criteria criteria = getCurrentCriteria(); DriftCategory[] driftCategoriesFilter = RPCDataSource.getArrayFilter(criteria, DriftDataSource.FILTER_CATEGORIES, DriftCategory.class);
rhq-commits@lists.fedorahosted.org