From a10612b02ffd1df92b32bc9dd06fe95547dc15c2 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 16 Jan 2018 10:15:08 +0000
Subject: [PATCH] SSDM-6056 : Fix several issues
SVN: 39099
---
.../js/views/AdvancedSearch/AdvancedSearchController.js | 6 ++++--
.../eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js | 6 ++++--
2 files changed, 8 insertions(+), 4 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 ab371003331..307e6bb426f 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
@@ -122,18 +122,20 @@ function AdvancedSearchController(mainController, forceSearch) {
var fetchOptions = {};
+ var optionsSearch = null;
if(options) {
fetchOptions.count = options.pageSize;
fetchOptions.from = options.pageIndex * options.pageSize;
fetchOptions.minTableInfo = true;
fetchOptions.withExperiment = true;
+ optionsSearch = options.search;
// TODO : Unused on the UI, should be added for DataSets
// fetchOptions.withSample = true;
}
- if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
+ if(!criteria.cached || (criteria.cachedSearch !== optionsSearch)) {
fetchOptions.cache = "RELOAD_AND_CACHE";
- criteria.cachedSearch = options.search;
+ criteria.cachedSearch = optionsSearch;
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 df0a22b8605..83a08a1badc 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
@@ -420,14 +420,16 @@ var SampleDataGridUtil = new function() {
withChildrenInfo : true
};
+ var optionsSearch = null;
if(options) {
fetchOptions.count = options.pageSize;
fetchOptions.from = options.pageIndex * options.pageSize;
+ optionsSearch = options.search;
}
- if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
+ if(!criteria.cached || (criteria.cachedSearch !== optionsSearch)) {
fetchOptions.cache = "RELOAD_AND_CACHE";
- criteria.cachedSearch = options.search;
+ criteria.cachedSearch = optionsSearch;
criteria.cached = true;
} else {
fetchOptions.cache = "CACHE";
--
GitLab