modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
| 17 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
| 4 ++
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 3a2356d895e97a831ff9c8da9b0c9ad44dee5dc4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Aug 26 10:50:43 2013 -0400
- Fix subtle bug in non-initial version groups selector setup where we
potentially queried the selector for assigned records prior to oninit()
being called and actually setting up the initial selection.
- Fix usability issue when assigning intial bundle groups. if the only
option is to leave unassigned, keep the selector disabled and the
"unassigned" radio button on.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
index f19153d..a1c5c36 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
@@ -93,7 +93,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
radioForm.setNumCols(1);
radioForm.setColWidths(350);
- RadioGroupItem radioGroupItem = new
RadioGroupItem("RadioOptions");
+ final RadioGroupItem radioGroupItem = new
RadioGroupItem("RadioOptions");
radioGroupItem.setTitleOrientation(TitleOrientation.TOP);
radioGroupItem.setTitle(MSG.view_bundle_createWizard_groupsStep_radioTitle());
radioGroupItem.setRequired(true);
@@ -103,18 +103,15 @@ public class BundleGroupsStep extends AbstractWizardStep {
valueMap.put("unassigned",
MSG.view_bundle_createWizard_groupsStep_leaveUnassigned());
valueMap.put("assign",
MSG.view_bundle_createWizard_groupsStep_assign());
radioGroupItem.setValueMap(valueMap);
- radioGroupItem.setValue("assign");
+ radioGroupItem.setValue(map.isEmpty() ? "unassigned" :
"assign");
radioGroupItem.addChangedHandler(new ChangedHandler() {
public void onChanged(ChangedEvent event) {
- if ("unassigned".equals(event.getValue())) {
- selector.disable();
- return;
+ if (map.isEmpty()) {
+ radioGroupItem.setValue("unassigned");
} else {
- if (!map.isEmpty()) {
- selector.enable();
- }
+
selector.setDisabled("unassigned".equals(event.getValue()));
}
canvas.markForRedraw();
@@ -126,7 +123,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
canvas.addMember(radioForm);
selector = getSelector(map, false);
- selector.enable();
+ selector.setDisabled(map.isEmpty());
canvas.addMember(selector);
} else if (!map.isEmpty()) {
@@ -164,7 +161,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
final Map<BundleGroup, Boolean> map = composite.getBundleGroupMap();
selector = getSelector(map, true);
- if (0 == selector.getSelectedRecords().length) {
+ if (!selector.hasInitialSelection()) {
selector.destroy();
DynamicForm form = new DynamicForm();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
index 4c5e219..b2003a3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
@@ -98,4 +98,8 @@ public class BundleGroupSelector extends
AbstractSelector<BundleGroup, BundleGro
return result;
}
}
+
+ public boolean hasInitialSelection() {
+ return null != initialSelection && initialSelection.length > 0;
+ }
}
Show replies by date