From cb300fe8f5e6de39a7cae4576a8fe4fd641e750a Mon Sep 17 00:00:00 2001
From: parkera <parkera>
Date: Fri, 11 Mar 2016 13:37:07 +0000
Subject: [PATCH] SSDM-3024 : Search call for samples (ongoing work)
SVN: 35885
---
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 1 +
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 22b8b30b3dd..5b77aafdf23 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -772,6 +772,7 @@ function ServerFacade(openbisServer) {
//TO-DO Setting the fetchOptions given standard settings
var fetchOptions = new SampleFetchOptions();
+ fetchOptions.withTags();
fetchOptions.withType();
fetchOptions.withSpace();
fetchOptions.withExperiment();
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 185729a6795..7390f4358ce 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
@@ -397,8 +397,8 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
};
var rowClick = function(e) {
- switch(e.data["@type"]) {
- case "as.dto.sample.Sample":
+ switch(e.data.entityKind) {
+ case "Sample":
mainController.changeView('showViewSamplePageFromPermId', e.data.permId);
break;
}
--
GitLab