From 61a31d5c90c5cbc56f42c93a170efd3be71e15ff Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 29 Apr 2014 10:26:35 +0000
Subject: [PATCH] SSDM-110: Annotations Support and bugfixes
SVN: 31427
---
.../newbrowser/html/js/views/SampleForm.js | 16 ++++++++++------
.../newbrowser/html/js/widgets/DataSetViewer.js | 14 ++++++++++++--
.../html/js/widgets/SampleLinksWidget.js | 5 ++---
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index a9255b3bdc2..0932bfb71b3 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -759,12 +759,16 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
var x = "123";
var listFilesForDataSetCallback =
function(dataFiles) {
- var elementId = 'preview-image';
- var downloadUrl = _this.profile.allDataStores[0].downloadUrl + '/' + data.result[0].code + "/" + dataFiles.result[1].pathInDataSet + "?sessionID=" + _this.serverFacade.getSession();
-
- var img = $("#" + elementId);
- img.attr('src', downloadUrl);
- img.attr('data-preview-loaded', 'true');
+ if(!dataFiles.result) {
+ //DSS Is not running probably
+ } else {
+ var elementId = 'preview-image';
+ var downloadUrl = _this.profile.allDataStores[0].downloadUrl + '/' + data.result[0].code + "/" + dataFiles.result[1].pathInDataSet + "?sessionID=" + _this.serverFacade.getSession();
+
+ var img = $("#" + elementId);
+ img.attr('src', downloadUrl);
+ img.attr('data-preview-loaded', 'true');
+ }
};
_this.serverFacade.listFilesForDataSet(data.result[0].code, "/", true, listFilesForDataSetCallback);
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
index 6ae465a38c6..20d9afc83b7 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
@@ -179,11 +179,21 @@ function DataSetViewer(containerId, profile, sample, serverFacade, datastoreDown
}
this.repaintImages = function() {
- _this = this;
-
var $container = $("#"+this.containerIdContent);
$container.empty();
+
+ //
+ // 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;
+ }
+
//
+ _this = this;
var maxImages = 30;
var numImages = 0;
for(var datasetCode in this.sampleDataSets) {
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
index 2c535414f86..00fa290f0fc 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
@@ -87,10 +87,9 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
return;
}
var xmlDoc = new DOMParser().parseFromString(stateField.val() , 'text/xml');
- var root = xmlDoc.children[0];
- var samples = root.children;
+ var samples = xmlDoc.getElementsByTagName("Sample");
for(var i = 0; i < samples.length; i++) {
- var sample = samples[0];
+ var sample = samples[i];
var permId = sample.attributes["permId"].value;
for(var j = 0; j < sample.attributes.length; j++) {
var attribute = sample.attributes[j];
--
GitLab