diff --git a/CHANGELOG b/CHANGELOG index de6ea125c7582c25aea2220faac0d70b14b2a4c5..822bae62704902d9808f138b7bd41e9dc203c6c7 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 167770bd575ab714fa6eff12863c0e66af947a4a..45b22e653f7a0696bb33a723635b05c1902feaf7 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 5cfd1aa9864288936c89e0ce61989f14d647b1e2..a28d912f3f616dd51e290faf67e4ed5cc808adc4 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 7e5bed4223df67eb08da3c792f496c1ab4e877cc..36ea892b297f9b4908b4969a686aa1b44052974a 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) {