modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java | 5 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 6 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java | 6 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 6 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java | 6 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 6 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java | 6 +++--- 7 files changed, 23 insertions(+), 18 deletions(-)
New commits: commit f138cb91b9ff54f34cf0d232e1eb668a5305989e Author: Mike Thompson mithomps@redhat.com Date: Tue May 1 08:26:21 2012 -0700
CSV Reports - disable export button if there is no records to export.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java index 4bf9a3e..849d2e9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java @@ -19,6 +19,7 @@ */ package org.rhq.enterprise.gui.coregui.client.components.table;
+import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridRecord;
/** @@ -60,5 +61,9 @@ public abstract class AbstractTableAction implements TableAction { return enabled; }
+ public boolean enableIfRecordsExist(ListGrid listGrid) { + return listGrid != null && listGrid.getTotalRows() != 0; + } + public abstract void executeAction(ListGridRecord[] selection, Object actionValue); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java index 36cfd97..a29f7b1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java @@ -33,8 +33,8 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.IconEnum; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; @@ -112,10 +112,10 @@ public class PlatformSummaryPortlet extends Table<PlatformMetricDataSource> impl }
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java index ee8ffe2..0ce325f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java @@ -25,7 +25,7 @@ package org.rhq.enterprise.gui.coregui.client.drift; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.common.EntityContext; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
public class SubsystemResourceDriftView extends DriftHistoryView { public SubsystemResourceDriftView(String locatorId, boolean hasWriteAccess) { @@ -39,10 +39,10 @@ public class SubsystemResourceDriftView extends DriftHistoryView { }
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java index d8d34a5..0ade877 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java @@ -47,8 +47,8 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.admin.templates.AlertDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.alert.definitions.AbstractAlertDefinitionsDataSource; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -106,10 +106,10 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D }
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java index 98170db..8592404 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java @@ -3,7 +3,7 @@ package org.rhq.enterprise.gui.coregui.client.report.alert; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.enterprise.gui.coregui.client.alert.SubsystemResourceAlertView; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
public class SubsystemRecentAlertsView extends SubsystemResourceAlertView {
@@ -18,10 +18,10 @@ public class SubsystemRecentAlertsView extends SubsystemResourceAlertView { }
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java index 4138a94..5bba112 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java @@ -27,8 +27,8 @@ import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.enterprise.gui.coregui.client.IconEnum; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
@@ -62,10 +62,10 @@ public class MeasurementOOBView extends Table<MeasurementOOBDataSource> implemen
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java index c22aa93..0fb6133 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java @@ -22,7 +22,7 @@ package org.rhq.enterprise.gui.coregui.client.report.operation; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.common.EntityContext; import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView;
/** @@ -44,10 +44,10 @@ public class SubsystemOperationHistoryListView extends OperationHistoryView { }
private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - return true; + return enableIfRecordsExist(getListGrid()); }
@Override
rhq-commits@lists.fedorahosted.org