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: Allow passing the current values to be used in stead of omitted fields

Browse source
This commit is contained in:
Kim Alvefur 2018-08-05 15:50:06 +02:00
parent 553b67ccd0
commit 876b96659c
2 changed files with 43 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

39
spec/util_dataforms_spec.lua
View file

@ -347,5 +347,44 @@ describe("util.dataforms", function ()
assert.truthy(f:find("field/option"));
end);
end);
describe("using current values in place of missing fields", function ()
it("gets back the previous values when given an empty form", function ()
local current = {
["list-multi-field"] = {
"list-multi-option-value#2";
};
["list-single-field"] = "list-single-value#2";
["hidden-field"] = "hidden-value";
["boolean-field"] = false;
["text-multi-field"] = "words\ngo\nhere";
["jid-single-field"] = "alice@example.com";
["text-private-field"] = "hunter2";
["text-single-field"] = "text-single-value";
["jid-multi-field"] = {
"bob@example.net";
};
};
local expect = {
-- FORM_TYPE = "xmpp:prosody.im/spec/util.dataforms#1"; -- does this need to be included?
["list-multi-field"] = {
"list-multi-option-value#2";
};
["list-single-field"] = "list-single-value#2";
["hidden-field"] = "hidden-value";
["boolean-field"] = false;
["text-multi-field"] = "words\ngo\nhere";
["jid-single-field"] = "alice@example.com";
["text-private-field"] = "hunter2";
["text-single-field"] = "text-single-value";
["jid-multi-field"] = {
"bob@example.net";
};
};
local data, err = some_form:data(st.stanza("x", {xmlns="jabber:x:data"}), current);
assert.is.table(data, err);
assert.same(expect, data, "got back the same data");
end);
end);
end);

6
util/dataforms.lua
View file

@ -142,7 +142,7 @@ end
local field_readers = {};
function form_t.data(layout, stanza)
function form_t.data(layout, stanza, current)
local data = {};
local errors = {};
local present = {};
@ -157,7 +157,9 @@ function form_t.data(layout, stanza)
end
if not tag then
if field.required then
if current and current[field.name] ~= nil then
data[field.name] = current[field.name];
elseif field.required then
errors[field.name] = "Required value missing";
end
elseif field.name then