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 8476b789b80c19a8155aff92b85d6fe540c83d88..9c78306935614c7959a892c6ac70d03b45202fdc 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;