summaryrefslogtreecommitdiffstats
path: root/lib/modelfunctions.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2010-10-28 07:26:10 +0000
committerTed Trask <ttrask01@yahoo.com>2010-10-28 07:26:10 +0000
commitebc412607ee301b6615ae91bbb8112d72c9cadc0 (patch)
treebbde274c9b9c4dadea8d3dffc46b2847956e9c81 /lib/modelfunctions.lua
parentb6e47a6c610c259172e39f28e89f5438535578c1 (diff)
downloadacf-core-ebc412607ee301b6615ae91bbb8112d72c9cadc0.tar.bz2
acf-core-ebc412607ee301b6615ae91bbb8112d72c9cadc0.tar.xz
Update modelfunctions and viewfunctions to allow specifying option value and label.
Diffstat (limited to 'lib/modelfunctions.lua')
-rw-r--r--lib/modelfunctions.lua10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/modelfunctions.lua b/lib/modelfunctions.lua
index 3a02bd5..0004676 100644
--- a/lib/modelfunctions.lua
+++ b/lib/modelfunctions.lua
@@ -134,7 +134,9 @@ end
function validateselect(select)
for i,option in ipairs(select.option) do
- if option == select.value then
+ if type(option) == "string" and option == select.value then
+ return true
+ elseif type(option) == "table" and option.value == select.value then
return true
end
end
@@ -145,7 +147,11 @@ end
function validatemulti(multi)
local reverseoption = {}
for i,option in ipairs(multi.option) do
- reverseoption[option] = i
+ if type(option) == "string" then
+ reverseoption[option] = i
+ else
+ reverseoption[option.value] = i
+ end
end
for i,value in ipairs(multi.value) do
if not reverseoption[value] then