Skip to content
Snippets Groups Projects
Commit 80fe767c authored by Fuentes Serna  Juan Mariano (ID SIS)'s avatar Fuentes Serna Juan Mariano (ID SIS)
Browse files

SSDM-6014

parent a949b64e
No related branches found
No related tags found
No related merge requests found
...@@ -131,26 +131,22 @@ function GridView(gridModel) { ...@@ -131,26 +131,22 @@ function GridView(gridModel) {
sample = jQuery.extend(true, {}, labels[i].data); sample = jQuery.extend(true, {}, labels[i].data);
} }
if(sample && sample.sampleTypeCode === "STORAGE_POSITION") { if(sample && sample.sampleTypeCode === "STORAGE_POSITION" && sample.parents && sample.parents[0]) {
if(sample.parents && sample.parents[0]) { if(profile.propertyReplacingCode && sample.parents[0].properties && sample.parents[0].properties[profile.propertyReplacingCode]) {
if(profile.propertyReplacingCode && sample.parents[0].properties && sample.parents[0].properties[profile.propertyReplacingCode]) { // Label
// Label labels[i].displayName = sample.parents[0].properties[profile.propertyReplacingCode];
labels[i].displayName = sample.parents[0].properties[profile.propertyReplacingCode]; } else {
// Tooltip, show also information from the parent //Label
sample.properties[profile.propertyReplacingCode] = sample.parents[0].properties[profile.propertyReplacingCode]; labels[i].displayName = sample.parents[0].code;
} else {
//Label
labels[i].displayName = sample.parents[0].code;
//Tooltip, show also information from the parent
sample.code = sample.parents[0].code;
}
var href = Util.getURLFor(null, "showViewSamplePageFromPermId", sample.parents[0].permId);
optSampleTitle = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(labels[i].displayName);
optSampleTitle.click(function() {
mainController.changeView("showViewSamplePageFromPermId", sample.parents[0].permId);
});
} }
sample = sample.parents[0];
var href = Util.getURLFor(null, "showViewSamplePageFromPermId", sample.permId);
optSampleTitle = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(labels[i].displayName);
optSampleTitle.click(function() {
mainController.changeView("showViewSamplePageFromPermId", sample.permId);
});
} }
var labelContainer = $("<div>", { class: "storageBox", id : Util.guid() }).append(labels[i].displayName); var labelContainer = $("<div>", { class: "storageBox", id : Util.guid() }).append(labels[i].displayName);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment