modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 1 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 78ccb4b157c81e7a6c60222affb70a95e5958c69 Author: Ian Springer ian.springer@redhat.com Date: Wed Mar 9 11:03:19 2011 -0500
fix bug where clicking on Reset button on user or role edit view would result in an exception (https://bugzilla.redhat.com/show_bug.cgi?id=677421)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java index 04330ae..9fefcb3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java @@ -283,7 +283,7 @@ public class RolesDataSource extends RPCDataSource<Role> { Integer id = getFilter(request, Field.ID, Integer.class); criteria.addFilterId(id);
- Integer subjectId = request.getCriteria().getAttributeAsInt(CriteriaField.SUBJECT_ID); + Integer subjectId = getFilter(request, CriteriaField.SUBJECT_ID, Integer.class); if (subjectId != null) { criteria.addFilterSubjectId(subjectId); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java index e4f061b..f9249f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java @@ -457,6 +457,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc public void onClick(ClickEvent clickEvent) { reset(); resetButton.disable(); + saveButton.disable(); } }); hLayout.addMember(resetButton); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index 07f766b..b87345e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -21,7 +21,9 @@ package org.rhq.enterprise.gui.coregui.client.util; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -507,7 +509,8 @@ public abstract class RPCDataSource<T> extends DataSource { @SuppressWarnings("unchecked") public static <S> S getFilter(DSRequest request, String paramName, Class<S> type) { Criteria criteria = request.getCriteria(); - Map<String, Object> criteriaMap = criteria.getValues(); + Map<String, Object> criteriaMap = (criteria != null) ? criteria.getValues() : + Collections.<String, Object>emptyMap();
S result = null;
rhq-commits@lists.fedorahosted.org