From b7a5e75aa74c8f40886b07836ddf4239ea417b5b Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 6 Feb 2015 10:48:40 +0000
Subject: [PATCH] SSDM-1453 : Sample Table shows the first image from preview
datasets when more than one.
SVN: 33401
---
.../SampleTable/SampleTableController.js | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
index fcfa68cc58e..d901b95bca7 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
@@ -99,13 +99,18 @@ function SampleTableController(parentController, title, experimentIdentifier) {
mainController.serverFacade.searchDataSetsWithTypeForSamples("ELN_PREVIEW", [data.permId], function(data) {
data.result.forEach(function(dataset) {
var listFilesForDataSetCallback = function(dataFiles) {
- var downloadUrl = profile.allDataStores[0].downloadUrl + '/' + dataset.code + "/" + dataFiles.result[1].pathInDataSet + "?sessionID=" + mainController.serverFacade.getSession();
- var previewImage = $("<img>", { 'src' : downloadUrl, 'class' : 'zoomableImage', 'style' : 'height:80px;' });
- previewImage.click(function(event) {
- Util.showImage(downloadUrl);
- event.stopPropagation();
- });
- previewContainer.append(previewImage);
+ for(var pathIdx = 0; pathIdx < dataFiles.result.length; pathIdx++) {
+ if(!dataFiles.result[pathIdx].isDirectory) {
+ var downloadUrl = profile.allDataStores[0].downloadUrl + '/' + dataset.code + "/" + dataFiles.result[pathIdx].pathInDataSet + "?sessionID=" + mainController.serverFacade.getSession();
+ var previewImage = $("<img>", { 'src' : downloadUrl, 'class' : 'zoomableImage', 'style' : 'height:80px;' });
+ previewImage.click(function(event) {
+ Util.showImage(downloadUrl);
+ event.stopPropagation();
+ });
+ previewContainer.append(previewImage);
+ break;
+ }
+ }
};
mainController.serverFacade.listFilesForDataSet(dataset.code, "/", true, listFilesForDataSetCallback);
});
--
GitLab