After-merge fix.

Evolveum · Jul 15, 2017 · 278a1f1 · 278a1f1
1 parent 76ec55e
commit 278a1f1
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
@@ -47,10 +47,19 @@ private void initLayout() {
     		@Override
     		public <T> void exportData(IDataProvider<T> dataProvider, List<IExportableColumn<T, ?>> columns,
     				OutputStream outputStream) throws IOException {
-				((BaseSortableDataProvider) dataProvider).setExportSize(true);
-				super.exportData(dataProvider, columns, outputStream);
-				((BaseSortableDataProvider) dataProvider).setExportSize(false);
-    		}
+    			if (dataProvider instanceof SelectableBeanObjectDataProvider) {
+					((SelectableBeanObjectDataProvider) dataProvider).setExport(true);	    // TODO implement more nicely
+				}
+				try {
+					((BaseSortableDataProvider) dataProvider).setExportSize(true);
+					super.exportData(dataProvider, columns, outputStream);
+					((BaseSortableDataProvider) dataProvider).setExportSize(false);
+				} finally {
+					if (dataProvider instanceof SelectableBeanObjectDataProvider) {
+						((SelectableBeanObjectDataProvider) dataProvider).setExport(false);
+					}
+				}
+			}
     	};
         final AbstractAjaxDownloadBehavior ajaxDownloadBehavior = new AbstractAjaxDownloadBehavior() {
         	private static final long serialVersionUID = 1L;