# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1279295634 -3600
# Node ID 28cb5ad728707d932d703d03689f2f876ab99d85
# Parent  bb49ada7cf45b6c48e3c25a37135a4bf1792c234# Parent  e74e80b454a1e2a3c3bc7efa8eb636fe9f651fc0
Merge Florob->trunk

diff -r bb49ada7cf45 -r 28cb5ad72870 util/dataforms.lua
--- a/util/dataforms.lua	Fri Jul 16 15:19:44 2010 +0100
+++ b/util/dataforms.lua	Fri Jul 16 16:53:54 2010 +0100
@@ -67,9 +67,25 @@
 					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
+				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
@@ -149,6 +165,17 @@
 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");