From 47eef34352af8b004c9ec18b3ff1ed42405e1180 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 8 Dec 2017 11:02:57 +0000
Subject: [PATCH] SSDM-6004 : Bugfix, table cache issue with filters
SVN: 39029
---
.../html/js/views/AdvancedSearch/AdvancedSearchController.js | 3 ++-
.../eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index 656c0fdac92..ab371003331 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -131,8 +131,9 @@ function AdvancedSearchController(mainController, forceSearch) {
// fetchOptions.withSample = true;
}
- if(!criteria.cached) {
+ if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
fetchOptions.cache = "RELOAD_AND_CACHE";
+ criteria.cachedSearch = options.search;
criteria.cached = true;
} else {
fetchOptions.cache = "CACHE";
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index ba9fd31390d..00fb687eefa 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -350,13 +350,14 @@ var SampleDataGridUtil = new function() {
fetchOptions.from = options.pageIndex * options.pageSize;
}
- if(!criteria.cached) {
+ if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
fetchOptions.cache = "RELOAD_AND_CACHE";
+ criteria.cachedSearch = options.search;
criteria.cached = true;
} else {
fetchOptions.cache = "CACHE";
}
-
+
var criteriaToSend = $.extend(true, {}, criteria);
if(options && options.searchOperator && options.search) {
--
GitLab