From 637c7a8a02b157029f7d0553593ef1436e5fe8cb Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 28 Jan 2014 09:59:13 +0000
Subject: [PATCH] BIS-627 / SP-1130: ELN UI - Data Set Uploader - Bugfix
SVN: 30430
---
.../webapps/newbrowser/html/js/UI/DataSetViewer.js | 12 +++++++++++-
.../1/as/webapps/newbrowser/html/js/UI/SampleForm.js | 8 ++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetViewer.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetViewer.js
index 644b6291fad..b6b4a8877ce 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetViewer.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetViewer.js
@@ -110,7 +110,17 @@ function DataSetViewer(containerId, sample, serverFacade, datastoreDownloadURL)
$container.append($("<legend>").html("DataSets ").append($uploadButton));
//
- // Don't paint datasets for entities that don't have
+ // No data store URL
+ //
+ if(datastoreDownloadURL === null) {
+ $container.append($("<p>")
+ .append($("<i>", { class: "icon-ban-circle" }))
+ .append(" Please configure properly your DSS server properly, looks like is not reachable."));
+ return;
+ }
+
+ //
+ // Don't paint data sets for entities that don't have
//
var numberOfDatasets = 0;
for(var datasetCode in this.sampleDataSets) {
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleForm.js
index 3815abf5157..436a76a7201 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleForm.js
@@ -87,9 +87,13 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
}
}
} else if(localReference.mode === SampleFormMode.EDIT || localReference.mode === SampleFormMode.VIEW) {
- this.dataSetViewer = new DataSetViewer("dataSetViewerContainer", localReference.sample, localReference.serverFacade, localReference.profile.allDataStores[0].downloadUrl);
+ var dataStoreURL = null;
+ if(localReference.profile.allDataStores.length > 0) {
+ dataStoreURL = localReference.profile.allDataStores[0].downloadUrl
+ }
+ this.dataSetViewer = new DataSetViewer("dataSetViewerContainer", localReference.sample, localReference.serverFacade, dataStoreURL);
this.dataSetViewer.init();
-
+
var sample = localReference.sample;
//Populate Project/Space and Code
if(localReference.isELNExperiment) {
--
GitLab