modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ExportModalWindow.java
| 31 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ExportChangeHandler.java
| 6 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
| 7 --
3 files changed, 24 insertions(+), 20 deletions(-)
New commits:
commit a04052c588ff0db24c565347e8de56a2c1055705
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Mar 28 09:23:10 2012 -0400
[BZ 802544] Pass the exportAll flag to the export window
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ExportModalWindow.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ExportModalWindow.java
index 91f44e3..3372829 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ExportModalWindow.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ExportModalWindow.java
@@ -20,6 +20,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.components;
+import java.util.LinkedHashMap;
+import java.util.Set;
+
import com.google.gwt.core.client.GWT;
import com.google.gwt.http.client.URL;
import com.google.gwt.user.client.Window;
@@ -38,14 +41,12 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.PopupWindow;
-import java.util.LinkedHashMap;
-import java.util.Set;
-
/**
* Build a custom Export window based for particular export screens.
*
@@ -65,7 +66,7 @@ public class ExportModalWindow {
private PopupWindow exportWindow;
- private boolean showDetail;
+ private boolean showAllDetail;
// optional Fields
@@ -78,7 +79,7 @@ public class ExportModalWindow {
*/
String[] operationRequestStatuses;
- Set<Integer> resourceTypeIdsForExport;
+ Set<Integer> resourceTypeIds;
// for Recent Drift Report
String driftDefinition;
@@ -93,8 +94,8 @@ public class ExportModalWindow {
}
private ExportModalWindow(String reportUrl, boolean showDetail, Set<Integer>
resourceTypeIds) {
this.reportUrl = reportUrl;
- this.showDetail = showDetail;
- resourceTypeIdsForExport = resourceTypeIds;
+ this.showAllDetail = showDetail;
+ this.resourceTypeIds = resourceTypeIds;
createDialogWindow();
}
@@ -125,9 +126,9 @@ public class ExportModalWindow {
return newExportDialog;
}
- public static ExportModalWindow createExportWindowForInventorySummary(String
reportUrl,
+ public static ExportModalWindow createExportWindowForInventorySummary(String
reportUrl, boolean showAllDetails,
Set<Integer> resourceTypeIdsForExport) {
- ExportModalWindow newExportDialog = new ExportModalWindow(reportUrl, true,
resourceTypeIdsForExport);
+ ExportModalWindow newExportDialog = new ExportModalWindow(reportUrl,
showAllDetails, resourceTypeIdsForExport);
return newExportDialog;
}
@@ -157,7 +158,7 @@ public class ExportModalWindow {
formatsList.setDefaultValue("csv");
CheckboxItem detailCheckboxItem = new CheckboxItem(DETAILS_FIELD, "Show
Detail");
- detailCheckboxItem.setVisible(showDetail);
+ detailCheckboxItem.setVisible(showAllDetail);
detailCheckboxItem.setValue(false);
DateRangeItem dateRangeItem = new DateRangeItem(DATE_RANGE_FIELD, "Date
Range");
@@ -211,7 +212,7 @@ public class ExportModalWindow {
String format = form.getValueAsString(FORMAT_FIELD);
StringBuilder queryString = new StringBuilder();
- if (showDetail) {
+ if (showAllDetail) {
queryString.append("details=").append(form.getValueAsString(DETAILS_FIELD));
}
if(operationRequestStatuses != null){
@@ -254,12 +255,12 @@ public class ExportModalWindow {
return URL.encode(BASE_URL + reportUrl + "." + format +
"?"+queryString);
}
- public boolean isShowDetail(){
- return showDetail;
+ public boolean isShowAllDetail(){
+ return showAllDetail;
}
- public void setShowDetail(boolean showDetail) {
- this.showDetail = showDetail;
+ public void setShowAllDetail(boolean showAllDetail) {
+ this.showAllDetail = showAllDetail;
}
public void setDriftDefinition(String driftDefinition) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ExportChangeHandler.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ExportChangeHandler.java
index cb34c0c..6cc5fc2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ExportChangeHandler.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ExportChangeHandler.java
@@ -48,7 +48,11 @@ public class ExportChangeHandler implements ChangedHandler {
this.exportAttribute = exportAttribute;
}
- public Set<Integer> getResourceTypeIdsForExport() {
+ /**
+ * @return The set of resource type ids that the user has selected for which details
+ * should be included in the export.
+ */
+ public Set<Integer> getResourceTypeIds() {
return resourceTypeIds;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
index 6a513fc..f6b84b9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
@@ -79,6 +79,8 @@ public class ResourceInstallReport extends LocatableVLayout implements
Bookmarka
private ResourceSearchView resourceList;
+ private boolean exportAll;
+
public ResourceInstallReport(String locatorId ) {
super(locatorId);
setHeight100();
@@ -245,7 +247,7 @@ public class ResourceInstallReport extends LocatableVLayout implements
Bookmarka
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue)
{
ExportModalWindow exportModalWindow =
ExportModalWindow.createExportWindowForInventorySummary(
- "inventorySummary",
exportChangeHandler.getResourceTypeIdsForExport());
+ "inventorySummary", exportAll,
exportChangeHandler.getResourceTypeIds());
exportModalWindow.show();
refreshTableInfo();
}
@@ -261,9 +263,6 @@ public class ResourceInstallReport extends LocatableVLayout implements
Bookmarka
setFilterFormItems(exportAllDetails);
exportAllDetails.addChangedHandler(new ChangedHandler() {
-
- boolean exportAll;
-
@Override
public void onChanged(ChangedEvent event) {
exportAll = !exportAll;
Show replies by date