mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.dataforms: Detach generation of options from values (fixes #1177)

Browse source
This commit is contained in:
Kim Alvefur 2018-08-03 18:35:00 +02:00
parent 00a2891787
commit ef485bd2af
1 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

51
util/dataforms.lua
View file

@ -49,6 +49,27 @@ function form_t.form(layout, data, formtype)
value = field.value;
end
if formtype ~= "result" and field.options then
local defaults = {};
for _, val in ipairs(field.options) do
if type(val) == "table" then
form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
if val.default then
defaults[#defaults+1] = val.value;
end
else
form:tag("option", { label= val }):tag("value"):text(val):up():up();
end
end
if not value then
if field_type == "list-single" then
value = defaults[1];
elseif field_type == "list-multi" then
value = defaults;
end
end
end
if value ~= nil then
-- Add value, depending on type
if field_type == "hidden" then
@ -78,40 +99,10 @@ function form_t.form(layout, data, formtype)
form:tag("value"):text(line):up();
end
elseif field_type == "list-single" then
if formtype ~= "result" then
local has_default = false;
for _, val in ipairs(field.options or value) do
if type(val) == "table" then
form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
if value == val.value or val.default and (not has_default) then
form:tag("value"):text(val.value):up();
has_default = true;
end
else
form:tag("option", { label= val }):tag("value"):text(val):up():up();
end
end
end
if (field.options or formtype == "result") and value then
form:tag("value"):text(value):up();
end
elseif field_type == "list-multi" then
if formtype ~= "result" then
for _, val in ipairs(field.options or value) do
if type(val) == "table" then
form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
if not field.options and val.default then
form:tag("value"):text(val.value):up();
end
else
form:tag("option", { label= val }):tag("value"):text(val):up():up();
end
end
end
if (field.options or formtype == "result") and value then
for _, val in ipairs(value) do
form:tag("value"):text(val):up();
end
end
end
end