convert field choices to objects to allow additional parameters

1 files changed, 13 insertions, 3 deletions

diff --git a/acf2/model/field.lua b/acf2/model/field.lua
index 64c727b..0600080 100644
--- a/acf2/model/field.lua
+++ b/acf2/model/field.lua
@@ -59,8 +59,18 @@ function M.Field:init(params)
 
    if self.choice then
       self.choice = util.map(
-	 function(ch)
-	    return type(ch) == 'table' and ch or {ch, self:auto_ui_name(ch)}
+	 function(choice)
+	    if type(choice) ~= 'table' then
+	       choice = {choice, self:auto_ui_name(choice)}
+	    end
+	    for i, k in ipairs{'value', 'ui-value'} do
+	       if choice[i] then
+		  assert(not choice[k])
+		  choice[k] = choice[i]
+		  choice[i] = nil
+	       end
+	    end
+	    return choice
 	 end,
 	 self.choice
       )
@@ -106,7 +116,7 @@ function M.Field:_validate(context, value)
       raise(context.path, 'Required value not set')
    end
    if self.choice and value ~= nil and not util.contains(
-      util.map(function(ch) return ch[1] end, self.choice), value
+      util.map(function(ch) return ch.value end, self.choice), value
    ) then
       raise(context.path, 'Invalid value')
    end