# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1533329728 -7200
# Node ID 05979ae1e38a1cba6988cfd6bd9eb444f7555610
# Parent  04a284c5b88b708e8806f4d5d5238d3c69dd8a2d
util.dataforms: Only allow overriding of options when passed via the :form method

diff -r 04a284c5b88b -r 05979ae1e38a util/dataforms.lua
--- a/util/dataforms.lua	Fri Aug 03 22:25:16 2018 +0200
+++ b/util/dataforms.lua	Fri Aug 03 22:55:28 2018 +0200
@@ -50,18 +50,17 @@
 			end
 		end
 
-		local value;
+		local value = field.value;
+		local options = field.options;
+
 		if data and data[field.name] ~= nil then
 			value = data[field.name];
-		else
-			value = field.value;
-		end
 
-		local options = field.options;
-		if formtype == "form" and value
-		and (field_type == "list-single" or field_type == "list-multi") then
-			-- Allow passing dynamically generated options as values
-			options, value = value, nil;
+			if formtype == "form" and type(value) == "table"
+				and (field_type == "list-single" or field_type == "list-multi") then
+				-- Allow passing dynamically generated options as values
+				options, value = value, nil;
+			end
 		end
 
 		if formtype == "form" and options then