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.dataforms: Coerce number values for boolean fields

Browse source 
Makes more sense than coercing to a string, which would always be
truthy.
This commit is contained in:
Kim Alvefur 2021-10-26 15:15:57 +02:00
parent 533ab7a4ce
commit fc677f515f
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spec/util_dataforms_spec.lua
View file

@ -417,6 +417,16 @@ describe("util.dataforms", function ()
end); end);
end); end);
describe("number handling", function()
it("handles numbers as booleans", function()
local f = dataforms.new { { name = "boolean"; type = "boolean" } };
local x = f:form({ boolean = 0 });
assert.equal("0", x:find "field/value#");
x = f:form({ boolean = 1 });
assert.equal("1", x:find "field/value#");
end);
end)
describe("datatype validation", function () describe("datatype validation", function ()
local f = dataforms.new { local f = dataforms.new {
{ {

7
util/dataforms.lua
View file

@ -103,8 +103,11 @@ function form_t.form(layout, data, formtype)
if value ~= nil then if value ~= nil then
if type(value) == "number" then if type(value) == "number" then
-- TODO validate that this is ok somehow, eg check field.datatype if field_type == "boolean" then
value = ("%g"):format(value); value = value ~= 0;
else
value = ("%g"):format(value);
end
end end
-- Add value, depending on type -- Add value, depending on type
if field_type == "hidden" then if field_type == "hidden" then