From 22ab97acb9e8d6906b3c722c5a7880152dd7ad42 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 1 Mar 2011 13:04:13 +0000
Subject: [PATCH] [LMS-2083] don't ask user what to do when no data set is
selected and reporting plugin is chosen
SVN: 20175
---
.../sample/SampleDataSetBrowser.java | 27 +++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
index bef9ee37eaf..e6251a84038 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
@@ -26,6 +26,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.AbstractExternalDataGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetComputeUtils;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetReportGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DatastoreServiceDescriptionModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ReportingPluginSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
@@ -33,6 +34,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.report.
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.DropDownList;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DisplayedOrSelectedDatasetCriteria;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSetWithEntityTypes;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescription;
@@ -141,11 +143,6 @@ class SampleDataSetBrowser extends AbstractExternalDataGrid
DataSetComputeUtils.createComputeAction(viewContext.getCommonViewContext(),
items, service, service.getServiceKind(), reportGeneratedAction)
.execute();
- // viewContext.getCommonService().processDatasets(
- // service,
- // items.createCriteria(false),
- // AsyncCallbackWithProgressBar.decorate(new ProcessingDisplayCallback(
- // viewContext), "Scheduling processing..."));
}
private void showMetadataView()
@@ -157,12 +154,20 @@ class SampleDataSetBrowser extends AbstractExternalDataGrid
{
SelectedAndDisplayedItems items =
browser.getSelectedAndDisplayedItemsAction().execute();
- DataSetComputeUtils.createComputeAction(viewContext.getCommonViewContext(),
- items, service, service.getServiceKind(), reportGeneratedAction)
- .execute();
- // DisplayedOrSelectedDatasetCriteria criteria = items.createCriteria(false);
- // DataSetReportGenerator.generateAndInvoke(viewContext.getCommonViewContext(),
- // service, items.createCriteria(false), reportGeneratedAction);
+
+ if (browser.getSelectedItems().isEmpty())
+ {
+ // when no data sets were selected perform query without asking
+ DisplayedOrSelectedDatasetCriteria criteria = items.createCriteria(false);
+ DataSetReportGenerator.generateAndInvoke(
+ viewContext.getCommonViewContext(), service, criteria,
+ reportGeneratedAction);
+ } else
+ {
+ DataSetComputeUtils.createComputeAction(viewContext.getCommonViewContext(),
+ items, service, service.getServiceKind(), reportGeneratedAction)
+ .execute();
+ }
}
};
--
GitLab