summaryrefslogtreecommitdiffstats
path: root/acf2/model/init.lua
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-12-11 12:44:08 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-12-11 13:01:38 +0200
commite813f5b0ddf26758e02a693867ddc025197c3373 (patch)
tree9159b813d7563d43610e84ed7f6fdbc1f79fe29b /acf2/model/init.lua
parent3c3a00f819b424714e615c15556832781b4b7446 (diff)
downloadaconf-e813f5b0ddf26758e02a693867ddc025197c3373.tar.bz2
aconf-e813f5b0ddf26758e02a693867ddc025197c3373.tar.xz
model: correct dereferencing behavior of reference sets
take options.dereference into account
Diffstat (limited to 'acf2/model/init.lua')
-rw-r--r--acf2/model/init.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/acf2/model/init.lua b/acf2/model/init.lua
index 711626b..c9d95f9 100644
--- a/acf2/model/init.lua
+++ b/acf2/model/init.lua
@@ -55,7 +55,7 @@ local isinstance = object.isinstance
local super = object.super
local pth = require('acf2.path')
-local update = require('acf2.util').update
+local util = require('acf2.util')
local stringy = require('stringy')
@@ -105,7 +105,7 @@ function M.Reference:_choice(context)
end
end
- else update(ch, {value=pth.escape(v), ['ui-value']=v}) end
+ else util.update(ch, {value=pth.escape(v), ['ui-value']=v}) end
if ch then table.insert(res, ch) end
end
@@ -126,9 +126,9 @@ end
function M.Reference:load(context, options)
local ref = super(self, M.Reference):load(context)
return (
- update(
- options or {}, {dereference=self.dereference}
- ).dereference and context.txn and ref
+ util.setdefault(
+ options or {}, 'dereference', self.dereference
+ ) and context.txn and ref
) and self:follow(context, ref) or ref
end