tildeverse/cryptpad
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue with Choice grids in forms (#827)

Browse Source
This commit is contained in:
yflory 2021-11-08 12:45:20 +01:00
parent b4bb28ef19
commit ca0bde068e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/form/inner.js
View File

@ -1815,7 +1815,7 @@ define([
defaultOpts: { defaultOpts: {
items: [1,2].map(function (i) { items: [1,2].map(function (i) {
return { return {
uid: Util.uid(), //uid: Util.uid(),
v: Messages._getKey('form_defaultItem', [i]) v: Messages._getKey('form_defaultItem', [i])
}; };
}), }),
@ -1831,6 +1831,10 @@ define([
if (!opts) { opts = Util.clone(TYPES.multiradio.defaultOpts); } if (!opts) { opts = Util.clone(TYPES.multiradio.defaultOpts); }
if (!Array.isArray(opts.items) || !Array.isArray(opts.values)) { return; } if (!Array.isArray(opts.items) || !Array.isArray(opts.values)) { return; }
var lines = opts.items.map(function (itemData) { var lines = opts.items.map(function (itemData) {
if (!itemData.uid) {
itemData.uid = Util.uid();
if (APP.isEditor) { APP.framework.localChange(); }
}
var name = itemData.uid; var name = itemData.uid;
var item = itemData.v; var item = itemData.v;
var els = extractValues(opts.values).map(function (data, i) { var els = extractValues(opts.values).map(function (data, i) {
@ -3340,9 +3344,11 @@ define([
// Make sure we can't create a section inside another one // Make sure we can't create a section inside another one
if (type === 'section' && arr !== content.order) { return; } if (type === 'section' && arr !== content.order) { return; }
var model = TYPES[type] || STATIC_TYPES[type];
if (!model) { return; }
content.form[_uid] = { content.form[_uid] = {
//q: Messages.form_default, //q: Messages.form_default,
//opts: opts opts: Util.clone(model.defaultOpts),
type: type, type: type,
}; };
if (full || inSection) { if (full || inSection) {