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: Only allow overriding of options when passed via the :form method

Browse source
This commit is contained in:
Kim Alvefur 2018-08-03 22:55:28 +02:00
parent 399ddd601d
commit 4e6aa6ffd2
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
util/dataforms.lua
View file

@ -50,18 +50,17 @@ function form_t.form(layout, data, formtype)
end
end
local value;
local value = field.value;
local options = field.options;
if data and data[field.name] ~= nil then
value = data[field.name];
else
value = field.value;
end
local options = field.options;
if formtype == "form" and value
and (field_type == "list-single" or field_type == "list-multi") then
-- Allow passing dynamically generated options as values
options, value = value, nil;
if formtype == "form" and type(value) == "table"
and (field_type == "list-single" or field_type == "list-multi") then
-- Allow passing dynamically generated options as values
options, value = value, nil;
end
end
if formtype == "form" and options then