modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
| 31 ++++------
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 1
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 3e11593249769dda043a4332a44c9450ce0de708
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 15 10:53:50 2011 -0500
BZ 636725 - provide the "show status" drop down on both the main
autodiscovery Q view and the simpler autodiscovery Q portlet view.
this way the portlet can show only ignored (or new and ignored) thus making the
"unignore" button meaningful and useful.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
index 6b99ed2..e59a74d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
@@ -40,7 +40,6 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.layout.HLayout;
-import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
@@ -97,27 +96,12 @@ public class ResourceAutodiscoveryView extends LocatableVLayout {
title.setPadding(4);
title.setStyleName("HeaderLabel");
- DynamicForm form = new
LocatableDynamicForm(this.extendLocatorId("Status"));
- final SelectItem statusSelectItem = new SelectItem("status",
MSG.common_title_status());
- statusSelectItem.setValueMap(AutodiscoveryQueueDataSource.NEW,
AutodiscoveryQueueDataSource.IGNORED,
- AutodiscoveryQueueDataSource.NEW_AND_IGNORED);
- statusSelectItem.setValue(AutodiscoveryQueueDataSource.NEW);
- form.setItems(statusSelectItem);
-
- statusSelectItem.addChangedHandler(new ChangedHandler() {
- public void onChanged(ChangedEvent changedEvent) {
- treeGrid.fetchData(new Criteria("status", (String)
statusSelectItem.getValue()));
- }
- });
-
HLayout titleLayout = new HLayout();
titleLayout.setAutoHeight();
titleLayout.setAlign(VerticalAlignment.BOTTOM);
titleLayout.addMember(img);
titleLayout.addMember(title);
- titleLayout.addMember(new LayoutSpacer());
- titleLayout.addMember(form);
addMember(titleLayout);
}
@@ -180,6 +164,21 @@ public class ResourceAutodiscoveryView extends LocatableVLayout {
ignoreButton.setDisabled(true);
unignoreButton.setDisabled(true);
+ DynamicForm form = new
LocatableDynamicForm(this.extendLocatorId("Status"));
+ final SelectItem statusSelectItem = new SelectItem("status",
MSG.view_autoDiscoveryQ_showStatus());
+ statusSelectItem.setValueMap(AutodiscoveryQueueDataSource.NEW,
AutodiscoveryQueueDataSource.IGNORED,
+ AutodiscoveryQueueDataSource.NEW_AND_IGNORED);
+ statusSelectItem.setValue(AutodiscoveryQueueDataSource.NEW);
+ statusSelectItem.setWrapTitle(false);
+ form.setItems(statusSelectItem);
+
+ statusSelectItem.addChangedHandler(new ChangedHandler() {
+ public void onChanged(ChangedEvent changedEvent) {
+ treeGrid.fetchData(new Criteria("status", (String)
statusSelectItem.getValue()));
+ }
+ });
+ footer.addMember(form);
+
treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
public void onSelectionChanged(SelectionEvent selectionEvent) {
boolean noneSelected = treeGrid.getSelection().length == 0;
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index ea140d2..6357630 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1026,6 +1026,7 @@ view_autoDiscoveryQ_field_key = Resource Key
view_autoDiscoveryQ_field_discoveryTime = Discovery Time
view_autoDiscoveryQ_field_inventoryStatus = Inventory Status
view_autoDiscoveryQ_loadFailure = Failed to load the inventory discovery queue
+view_autoDiscoveryQ_showStatus = Show
#==================== Bundles ======================
Show replies by date