diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-11-30 22:41:00 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-12-03 23:25:03 +0200 |
| commit | d780c72ff1ffa4963a241d19778e2d7a58abe5bf (patch) | |
| tree | 5818487c76cd49cb2cd98d8b52a7cd44a8c985b5 /acf2 | |
| parent | adf3a22a1ff154703803827117653aa2400ed08d (diff) | |
| download | acf2-d780c72ff1ffa4963a241d19778e2d7a58abe5bf.tar.bz2 acf2-d780c72ff1ffa4963a241d19778e2d7a58abe5bf.tar.xz | |
model: shortcut for util.map
Diffstat (limited to 'acf2')
| -rw-r--r-- | acf2/model/field.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/acf2/model/field.lua b/acf2/model/field.lua index 0600080..fe7fc07 100644 --- a/acf2/model/field.lua +++ b/acf2/model/field.lua @@ -15,6 +15,7 @@ local class = object.class local super = object.super local util = require('acf2.util') +local map = util.map M.Member = class() @@ -49,7 +50,7 @@ function M.Field:init(params) if self.editable == nil then self.editable = not self.compute end if self.condition then - self.condition = util.map( + self.condition = map( function(values) return type(values) == 'table' and values or {values} end, @@ -58,7 +59,7 @@ function M.Field:init(params) end if self.choice then - self.choice = util.map( + self.choice = map( function(choice) if type(choice) ~= 'table' then choice = {choice, self:auto_ui_name(choice)} @@ -116,7 +117,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.value end, self.choice), value + map(function(ch) return ch.value end, self.choice), value ) then raise(context.path, 'Invalid value') end |