From fa89f8ed466fc27b53e65ecb287e60331ebd523f Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Tue, 29 Jan 2019 14:31:37 +0100
Subject: [PATCH] SSDM-5361: StorageManager - showing sample info in tooltip
also when sample is not in a box
---
.../html/js/views/StorageManager/widgets/GridView.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
index f5a1a228e4c..bdc195e6d0e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
@@ -141,6 +141,10 @@ function GridView(gridModel) {
if (labels[i].data && labels[i].data["@type"] && labels[i].data["@type"] === "Sample") {
sample = jQuery.extend(true, {}, labels[i].data);
}
+ else if (!labels[i].data.size && labels[i].data && labels[i].data.samples && labels[i].data.samples.length > 0) {
+ // sample which is not in a box
+ sample = jQuery.extend(true, {}, labels[i].data.samples[0]);
+ }
if(sample && sample.sampleTypeCode === "STORAGE_POSITION" && sample.parents && sample.parents[0]) {
if(profile.propertyReplacingCode && sample.parents[0].properties && sample.parents[0].properties[profile.propertyReplacingCode]) {
@@ -155,9 +159,9 @@ function GridView(gridModel) {
var href = Util.getURLFor(null, "showViewSamplePageFromPermId", sample.permId);
optSampleTitle = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).text(labels[i].displayName);
- optSampleTitle.click(function() {
+ optSampleTitle.click((function(sample) {
mainController.changeView("showViewSamplePageFromPermId", sample.permId);
- });
+ }).bind(this, sample));
}
var labelContainer = $("<div>", { class: "storageBox", id : Util.guid() }).text(labels[i].displayName);
@@ -269,4 +273,4 @@ function GridView(gridModel) {
this.setExtraDragData = function(extraDragData) {
this._extraDragData = extraDragData;
}
-}
\ No newline at end of file
+}
--
GitLab