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

util.adhoc: Propagate error with producing initial initial data

Browse source 
Bonus: Allow use of util.error tables
This commit is contained in:
Kim Alvefur 2021-01-31 21:10:03 +01:00
parent e2f121eccb
commit 739c6859c7
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/adhoc.lua
View file

@ -23,8 +23,14 @@ local function new_initial_data_form(form, initial_data, result_handler)
local fields, err = form:data(data.form); local fields, err = form:data(data.form);
return result_handler(fields, err, data); return result_handler(fields, err, data);
else else
local values, err = initial_data(data);
if type(err) == "table" then
return {status = "error"; error = err}
elseif type(err) == "string" then
return {status = "error"; error = {type = "cancel"; condition = "internal-server-error", err}}
end
return { status = "executing", actions = {"next", "complete", default = "complete"}, return { status = "executing", actions = {"next", "complete", default = "complete"},
form = { layout = form, values = initial_data(data) } }, "executing"; form = { layout = form, values = values } }, "executing";
end end
end end
end end