From 364d26fb31a876b48c5c51d92f4ee724fc4230b0 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Thu, 15 Jul 2010 21:31:57 +0200 Subject: util.dataforms: Capability to set default for list-single --- util/dataforms.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util') diff --git a/util/dataforms.lua b/util/dataforms.lua index 5a3b1fb5..f6a61f1f 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -67,9 +67,14 @@ function form_t.form(layout, data, formtype) form:tag("value"):text(line):up(); end elseif field_type == "list-single" then + local has_default = false; for _, val in ipairs(value) do if type(val) == "table" then form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up(); + if val.default and (not has_default) then + form:tag("value"):text(val.value):up(); + has_default = true; + end else form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up(); end -- cgit v1.2.3 From 1f7f8e57a3f5bbffdc261285c8ef46e9749e22d3 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Thu, 15 Jul 2010 22:58:10 +0200 Subject: util.dataforms: Add list-multi support --- util/dataforms.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'util') diff --git a/util/dataforms.lua b/util/dataforms.lua index f6a61f1f..7814ada0 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -79,6 +79,17 @@ function form_t.form(layout, data, formtype) form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up(); end end + elseif field_type == "list-multi" then + for _, val in ipairs(value) do + if type(val) == "table" then + form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up(); + if val.default then + form:tag("value"):text(val.value):up(); + end + else + form:tag("option", { label= val }):tag("value"):text(tostring(val)):up():up(); + end + end end end @@ -154,6 +165,17 @@ field_readers["text-multi"] = field_readers["list-single"] = field_readers["text-single"]; +field_readers["list-multi"] = + function (field_tag) + local result = {}; + for value_tag in field_tag:childtags() do + if value_tag.name == "value" then + result[#result+1] = value_tag[1]; + end + end + return result; + end + field_readers["boolean"] = function (field_tag) local value = field_tag:child_with_name("value"); -- cgit v1.2.3