From d47ac212f89ebe8c78354df12ce13b633cee110e Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 2 Dec 2016 13:33:45 +0000
Subject: [PATCH] SSDM-4453 : Bugfix on v3 API search and side menu
SVN: 37427
---
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 9 +++++++--
.../html/js/views/SideMenu/SideMenuWidgetView.js | 7 +++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 4a9aeaef4b4..46702188601 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -407,6 +407,11 @@ function ServerFacade(openbisServer) {
//
// Data Set Related Functions
//
+ this.listDataSetsForExperiment = function(experimentToSend, trueOrFalse, callbackFunction) {
+ //Should be a V1 Experiment
+ this.openbisServer.listDataSetsForExperiments([experimentToSend], trueOrFalse, callbackFunction);
+ }
+
this.listDataSetsForSample = function(sampleToSend, trueOrFalse, callbackFunction) {
var _this = this;
var listDataSetsForV1Sample = function(v1Sample) {
@@ -749,10 +754,10 @@ function ServerFacade(openbisServer) {
fetchOptions.withModifier();
}
if(fetchOptions.withParents) {
- fetchOptions.withParents();
+ fetchOptions.withParentsUsing(fetchOptions);
}
if(fetchOptions.withChildren) {
- fetchOptions.withChildren();
+ fetchOptions.withChildrenUsing(fetchOptions);
}
if(fetchOptions.withProjects) {
fetchOptions.withProjects();
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index 4f53d0df114..31b7b0e2113 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -422,8 +422,11 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
sampleDisplayName = sample.properties[profile.propertyReplacingCode];
}
- var sampleLink = _this.getLinkForNode("Child: " + sampleDisplayName, sample.getPermId().getPermId(), "showViewSamplePageFromPermId", sample.getPermId().getPermId());
+ var sampleLink = _this.getLinkForNode(sampleDisplayName, sample.getPermId().getPermId(), "showViewSamplePageFromPermId", sample.getPermId().getPermId());
var sampleNode = { title : sampleLink, entityType: "SAMPLE", key : sample.getPermId().getPermId(), folder : true, lazy : true, view : "showViewSamplePageFromPermId", viewData: sample.getPermId().getPermId() };
+ if(sample.getType().getCode() === "EXPERIMENTAL_STEP") {
+ sampleNode.icon = "fa fa-flask";
+ }
results.push(sampleNode);
}
}
@@ -443,7 +446,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
datasetDisplayName = dataset.properties[profile.propertyReplacingCode];
}
- var datasetLink = _this.getLinkForNode("DataSet: " + datasetDisplayName, dataset.getPermId().getPermId(), "showViewDataSetPageFromPermId", dataset.getPermId().getPermId());
+ var datasetLink = _this.getLinkForNode(datasetDisplayName, dataset.getPermId().getPermId(), "showViewDataSetPageFromPermId", dataset.getPermId().getPermId());
results.push({ title : datasetLink, entityType: "DATASET", key : dataset.getPermId().getPermId(), folder : true, lazy : false, view : "showViewDataSetPageFromPermId", viewData: dataset.getPermId().getPermId(), icon : "fa fa-database" });
}
}
--
GitLab