From 068c3368476b12eb4b6ccc31f3edf7e75fb3aa2a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 18 Sep 2019 17:27:05 +0200
Subject: [PATCH] type included in header is properly assigned
---
CHANGELOG | 2 ++
frontend-js/src/main/js/gui/AddOverlayDialog.js | 1 +
.../src/test/js/gui/AddOverlayDialog-test.js | 13 +++++++++++++
3 files changed, 16 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 81656787ed..7a2ede31e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,8 @@ minerva (14.0.0~beta.2) unstable; urgency=low
create data overlay (#939)
* Bug fix: export to CD could misalign reaction lines that were imported from
format that didn't require reaction line to be attached to the species (#933)
+ * Bug fix: problem with uploading data_overlays with type included in header
+ (#936)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 16 Sep 2019 21:00:00 +0200
diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js
index e9d20fe7b0..c6a5b3fbb9 100644
--- a/frontend-js/src/main/js/gui/AddOverlayDialog.js
+++ b/frontend-js/src/main/js/gui/AddOverlayDialog.js
@@ -164,6 +164,7 @@ AddOverlayDialog.prototype.processFile = function (file) {
}
if (overlay.getType() !== undefined) {
+ var typeSelect = $("[name='overlay-type']", self.getElement())[0];
if ($("option[value='" + overlay.getType() + "']", typeSelect).length === 0) {
GuiConnector.warn("Invalid type: " + overlay.getType());
}
diff --git a/frontend-js/src/test/js/gui/AddOverlayDialog-test.js b/frontend-js/src/test/js/gui/AddOverlayDialog-test.js
index 5ee5b21065..1618a2b1c8 100644
--- a/frontend-js/src/test/js/gui/AddOverlayDialog-test.js
+++ b/frontend-js/src/test/js/gui/AddOverlayDialog-test.js
@@ -76,6 +76,19 @@ describe('AddOverlayDialog', function () {
assert.equal("GENERIC", dialog.getType());
});
});
+ it('set type from header', function () {
+ var dialog;
+ return ServerConnector.getProject().then(function (project) {
+ dialog = createDialog(project);
+ return dialog.init();
+ }).then(function () {
+ return helper.stringToBlob("#TYPE=GENETIC_VARIANT\ns1\n");
+ }).then(function (file) {
+ return dialog.processFile(file);
+ }).then(function () {
+ assert.equal("GENETIC_VARIANT", dialog.getType());
+ });
+ });
});
--
GitLab