The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix forms results with conditional sections (#799)

Browse Source
This commit is contained in:
yflory 2021-09-28 15:44:21 +02:00
parent ca95af082d
commit 04e298dd46
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/form/export.js
View File

@ -13,14 +13,14 @@ define([
value += '"' + vv + '"';
return value;
};
Export.results = function (content, answers, TYPES) {
Export.results = function (content, answers, TYPES, order) {
if (!content || !content.form) { return; }
var csv = "";
var form = content.form;
var questions = [Messages.form_poll_time, Messages.share_formView];
content.order.forEach(function (key) {
order.forEach(function (key) {
var obj = form[key];
if (!obj) { return; }
var type = obj.type;
@ -44,7 +44,7 @@ define([
var user = msg._userdata || {};
csv += escapeCSV(time);
csv += ',' + escapeCSV(user.name || Messages.anonymous);
content.order.forEach(function (key) {
order.forEach(function (key) {
var type = form[key].type;
if (!TYPES[type]) { return; } // Ignore static types
if (TYPES[type].exportCSV) {

5
www/form/inner.js
View File

@ -2628,7 +2628,7 @@ define([
var $results = $(results).appendTo($container);
$(exportButton).click(function () {
var csv = Exporter.results(content, answers, TYPES);
var csv = Exporter.results(content, answers, TYPES, getFullOrder(content));
if (!csv) { return void UI.warn(Messages.error); }
var suggestion = APP.framework._.title.suggestTitle('cryptpad-document');
var title = Util.fixFileName(suggestion) + '.csv';
@ -2644,7 +2644,8 @@ define([
$controls.hide().append(switchMode);
var show = function (answers, header) {
var elements = content.order.map(function (uid) {
var order = getFullOrder(content);
var elements = order.map(function (uid) {
var block = form[uid];
var type = block.type;
var model = TYPES[type];