From bc5f6e965475a66be86953b0a228a6f5abe86b21 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 14 Aug 2019 14:18:41 +0200
Subject: [PATCH] submap checkbox must be selected
---
CHANGELOG | 1 +
frontend-js/src/main/js/gui/export/AbstractExportPanel.js | 2 +-
frontend-js/src/main/js/gui/export/ElementExportPanel.js | 2 +-
frontend-js/src/main/js/gui/export/NetworkExportPanel.js | 6 ++----
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index de6ea125c7..822bae6270 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
minerva (13.1.3) stable; urgency=medium
* Bug fix: refreshing list of projects or list of users doesn't change active
page (#870)
+ * Bug fix: submap list must be selected to export from every submap (#874)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 14 Aug 2019 17:00:00 +0200
diff --git a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
index 167770bd57..45b22e653f 100644
--- a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
@@ -222,7 +222,7 @@ AbstractExportPanel.prototype._createSelectSubmapDiv = function (models) {
var id = model.getId();
var row = Functions.createElement({
type: "li",
- content: "<div class=\"checkbox\"><label> <input type=\"checkbox\" name=\"" + name + "\" value=\"" + id + "\" />" + name + "</label></div>",
+ content: "<div class=\"checkbox\"><label> <input type=\"checkbox\" name=\"" + name + "\" value=\"" + id + "\" checked/>" + name + "</label></div>",
xss: false
});
choicesContainer.appendChild(row);
diff --git a/frontend-js/src/main/js/gui/export/ElementExportPanel.js b/frontend-js/src/main/js/gui/export/ElementExportPanel.js
index 5cfd1aa986..a28d912f3f 100644
--- a/frontend-js/src/main/js/gui/export/ElementExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/ElementExportPanel.js
@@ -94,7 +94,7 @@ ElementExportPanel.prototype.createResponseString = function () {
var promises = [];
for (var i = 0; i < models.length; i++) {
var model = models[i];
- if (submapIds.length === 0 || $.inArray(model.getId(), submapIds) >= 0) {
+ if ($.inArray(model.getId(), submapIds) >= 0) {
promises.push(model.getAliases({
type: types,
complete: true,
diff --git a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
index 7e5bed4223..36ea892b29 100644
--- a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
@@ -146,10 +146,8 @@ function matchReaction(reaction, elementIds, reactionTypes, submapIds) {
if ($.inArray(reaction.getType(), reactionTypes) === -1) {
return false;
}
- if (submapIds.length > 0) {
- if ($.inArray(reaction.getModelId(), submapIds) === -1) {
- return false;
- }
+ if ($.inArray(reaction.getModelId(), submapIds) === -1) {
+ return false;
}
var count = 0;
reaction.getElements().forEach(function (element) {
--
GitLab