infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix CSV export in forms

pull/1/head
yflory 2021-06-30 12:47:02 +02:00
parent 87d04ed68a
commit c7ac75d137
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/form/export.js
View File

@ -5,7 +5,7 @@ define([
var Export = {};
var escapeCSV = function (v) {
if (!/("|,|\n)/.test(v)) {
if (!/("|,|\n|;)/.test(v)) {
return v || '';
}
var value = '';
@ -40,7 +40,11 @@ define([
csv += escapeCSV(time);
csv += ',' + escapeCSV(user.name || Messages.anonymous);
Object.keys(form).forEach(function (key) {
if (msg[key] && typeof(msg[key]) !== "string") { console.warn(key, msg[key]); }
var type = form[key].type;
if (TYPES[type] && TYPES[type].exportCSV) {
csv += ',' + escapeCSV(TYPES[type].exportCSV(msg[key]));
return;
}
csv += ',' + escapeCSV(String(msg[key] || ''));
});
});

9
www/form/inner.js
View File

@ -1646,6 +1646,15 @@ define([
return h('div.cp-form-type-poll', lines);
},
exportCSV: function (answer) {
if (!answer || !answer.values) { return ''; }
var str = '';
Object.keys(answer.values).sort().forEach(function (k, i) {
if (i !== 0) { str += ';'; }
str += k.replace(';', '').replace(':', '') + ':' + answer.values[k];
});
return str;
},
icon: h('i.cptools.cptools-form-poll')
},
};