From 0dde67b8884c16aa3212b7a0078dd6255f163b59 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 11 Nov 2016 08:57:59 +0000
Subject: [PATCH] SSDM-2597 : bugfix, exports working again
SVN: 37311
---
.../js/views/AdvancedSearch/AdvancedSearchController.js | 4 ++--
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 3 +++
.../html/js/views/DataGrid/SampleDataGridUtil.js | 9 +++++++--
3 files changed, 12 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 7410d14ff99..464594861e1 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
@@ -104,7 +104,7 @@ function AdvancedSearchController(mainController, forceFreeTextSearch) {
var criteriaToSend = $.extend(true, {}, criteria);
- if(options.search) {
+ if(options && options.search) {
var filter = options.search.toLowerCase().split(/[ ,]+/); //Split by regular space or comma
for(var fIdx = 0; fIdx < filter.length; fIdx++) {
var fKeyword = filter[fIdx];
@@ -112,7 +112,7 @@ function AdvancedSearchController(mainController, forceFreeTextSearch) {
}
}
- if(options.sortProperty && options.sortDirection) {
+ if(options && options.sortProperty && options.sortDirection) {
fetchOptions.sort = {
type : null,
name : null,
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index eae4e097ff8..67c8bd010c7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -527,6 +527,9 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
}
}
+ if(!entity) {
+ continue;
+ }
for(var propertyCode in entity.properties) {
if(entity.properties[propertyCode]) {
foundPropertyCodes[propertyCode] = true;
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 223b91f9851..f01a8a47ca8 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
@@ -305,7 +305,7 @@ var SampleDataGridUtil = new function() {
var criteriaToSend = $.extend(true, {}, criteria);
- if(options.search) {
+ if(options && options.search) {
var filter = options.search.toLowerCase().split(/[ ,]+/); //Split by regular space or comma
for(var fIdx = 0; fIdx < filter.length; fIdx++) {
var fKeyword = filter[fIdx];
@@ -313,7 +313,7 @@ var SampleDataGridUtil = new function() {
}
}
- if(options.sortProperty && options.sortDirection) {
+ if(options && options.sortProperty && options.sortDirection) {
fetchOptions.sort = {
type : null,
name : null,
@@ -340,6 +340,11 @@ var SampleDataGridUtil = new function() {
}
}
+// Util.blockUI();
+// mainController.serverFacade.searchForSamplesAdvanced(criteriaToSend, fetchOptions, function(result) {
+// callbackForSearch(result);
+// Util.unblockUI();
+// });
mainController.serverFacade.searchForSamplesAdvanced(criteriaToSend, fetchOptions, callbackForSearch);
}
}
--
GitLab