From 7a001fb651d41a36ea828cd81be9eabd719a0e4f Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 27 Nov 2009 09:00:57 +0000
Subject: [PATCH] fix filters refreshing
SVN: 13583
---
.../ui/grid/AbstractBrowserGrid.java | 23 ++++++++-----------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
index 980435e8900..5f88aa66f9a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
@@ -1210,26 +1210,21 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
{
recreateColumnModelAndRefreshColumnsWithFilters();
}
- boolean filtersChanged =
+ boolean columnFiltersChanged =
rebuildFiltersFromIds(getFilteredColumnIds(newColumnDataModels));
saveColumnDisplaySettings();
- if (customColumnsChanged)
+ if (customColumnsChanged || columnFiltersChanged)
{
- debug("refreshing custom columns in " + pendingFetchConfigOrNull
- + " mode");
+ debug("refreshing custom columns and/or filter distinct value in "
+ + pendingFetchConfigOrNull + " mode");
+ // we do not need to reload data if custom filters changed (we do
+ // not need distinct column values)
reloadData(createRefreshSettingsFetchConfig());
- } else
- {
- if (filtersChanged)
- {
- // refresh the data - some filters may have been removed
- createApplyFiltersDelagator().execute();
- }
- // settings will be automatically stored because of event handling
- refreshColumnsSettings();
- filterToolbar.refresh();
}
+ // settings will be automatically stored because of event handling
+ refreshColumnsSettings();
+ filterToolbar.refresh();
}
private ResultSetFetchConfig<String> createRefreshSettingsFetchConfig()
--
GitLab