Commit 3af2913d authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1060-information-in-overlay-dialog' into 'devel_14.0.x'

Resolve "Add additional information in overlay dialog"

See merge request minerva/core!1038
parents e5ed2a53 7cc34919
...@@ -11,8 +11,10 @@ minerva (14.0.6) stable; urgency=medium ...@@ -11,8 +11,10 @@ minerva (14.0.6) stable; urgency=medium
(regression 14.0.0, #1057) (regression 14.0.0, #1057)
* Bug fix: genetic variant overlay improperly processed elements identified * Bug fix: genetic variant overlay improperly processed elements identified
by miriam identifiers, like uniprot (#1059) by miriam identifiers, like uniprot (#1059)
* Bug fix: invalid information was provided for genetic variants overlay when
map organism was defined (#1060)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 18 Dec 2019 12:00:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Wed, 19 Dec 2019 13:00:00 +0200
minerva (14.0.5) stable; urgency=medium minerva (14.0.5) stable; urgency=medium
* Bug fix: copy-paste of genetic-variant data overlay into Add overlay * Bug fix: copy-paste of genetic-variant data overlay into Add overlay
......
...@@ -463,7 +463,11 @@ AliasInfoWindow.prototype.createGenomicDiv = function (params) { ...@@ -463,7 +463,11 @@ AliasInfoWindow.prototype.createGenomicDiv = function (params) {
} }
if (geneticInformation) { if (geneticInformation) {
if (genomeUrls.length === 0) { if (genomeUrls.length === 0) {
contentElement.innerHTML = "No organism defined for this project, cannot display variant data"; if (self.getCustomMap().getProject().getOrganism() === undefined) {
contentElement.innerHTML = "No organism defined for this project, cannot display variant data.";
} else {
contentElement.innerHTML = "No reference genome defined for this MINERVA instance, cannot display variant data.";
}
} else { } else {
for (i = 0; i < overlaysData.length; i++) { for (i = 0; i < overlaysData.length; i++) {
if (globalGeneVariants[i].length > 0) { if (globalGeneVariants[i].length > 0) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment