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 field names to be different from the 'var' attribute

Browse source 
This should allow the usage of long prefixes and namespace-like names to
be contained to the XML representation of the form, so that the code can
use more convenient names.
This commit is contained in:
Kim Alvefur 2018-09-01 01:24:46 +02:00
parent c9cc5d4a6e
commit 3da47d7dde
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/util_dataforms_spec.lua
View file

@ -386,5 +386,20 @@ describe("util.dataforms", function ()
assert.same(expect, data, "got back the same data");
end);
end);
describe("field 'var' property", function ()
it("works as expected", function ()
local f = dataforms.new {
{
var = "someprefix#the-field",
name = "the_field",
type = "text-single",
}
};
local x = f:form({the_field = "hello"});
assert.equal("someprefix#the-field", x:find"field@var");
assert.equal("hello", x:find"field/value#");
end);
end);
end);

4
util/dataforms.lua
View file

@ -42,7 +42,7 @@ function form_t.form(layout, data, formtype)
for _, field in ipairs(layout) do
local field_type = field.type or "text-single";
-- Add field tag
form:tag("field", { type = field_type, var = field.name, label = formtype ~= "submit" and field.label or nil });
form:tag("field", { type = field_type, var = field.var or field.name, label = formtype ~= "submit" and field.label or nil });
if formtype ~= "submit" then
if field.desc then
@ -150,7 +150,7 @@ function form_t.data(layout, stanza, current)
for _, field in ipairs(layout) do
local tag;
for field_tag in stanza:childtags("field") do
if field.name == field_tag.attr.var then
if (field.var or field.name) == field_tag.attr.var then
tag = field_tag;
break;
end