BIS-627 / SP-1130: ELN UI - Data Set Uploader - Bugfix

SVN: 30430

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) {

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) {