From 3750b065c86c5b2f5dc7cbb465566a0431c2b44d Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 16 Mar 2016 11:15:09 +0000
Subject: [PATCH] SSDM-3026 : Advanced search show properties using global
search.
SVN: 35918
---
.../js/views/AdvancedSearch/AdvancedSearchView.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index 8476b789b80..9c783069356 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -401,6 +401,20 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
var foundPropertyCodes = {};
for(var rIdx = 0; rIdx < results.objects.length; rIdx++) {
var entity = results.objects[rIdx];
+ if(isGlobalSearch) {
+ switch(entity.objectKind) {
+ case "SAMPLE":
+ entity = entity.sample;
+ break;
+ case "EXPERIMENT":
+ entity = entity.experiment;
+ break;
+ case "DATA_SET":
+ entity = entity.dataSet;
+ break;
+ }
+ }
+
for(var propertyCode in entity.properties) {
if(entity.properties[propertyCode]) {
foundPropertyCodes[propertyCode] = true;
--
GitLab