summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-03-24 02:54:06 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-03-25 09:02:58 +0200
commit499351fd1c1e7c1462df9a962e927fb4dba6b594 (patch)
tree10dc6481126bb727f17c59cdca8f5d3f619cebe6
parentf7a552e3b3c71e42129dab3a3348334c046537b6 (diff)
downloadaconf-499351fd1c1e7c1462df9a962e927fb4dba6b594.tar.bz2
aconf-499351fd1c1e7c1462df9a962e927fb4dba6b594.tar.xz
model: ignore private Model fields/methods when fetching objects
-rw-r--r--aconf/model/model.lua2
-rw-r--r--aconf/model/node.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/aconf/model/model.lua b/aconf/model/model.lua
index e71e73c..3f90450 100644
--- a/aconf/model/model.lua
+++ b/aconf/model/model.lua
@@ -170,7 +170,7 @@ function M.Model:init(context)
end
end
- return v
+ if options.private then return v end
end
if self.is_removable then
diff --git a/aconf/model/node.lua b/aconf/model/node.lua
index 741aaeb..92f3a1f 100644
--- a/aconf/model/node.lua
+++ b/aconf/model/node.lua
@@ -152,7 +152,7 @@ function M.TreeNode:init(context, params)
if not mt.txn then return end
function mt.save(k, v) rawset(self, k, v) end
- function mt.__index(t, k) return mt.get(k) end
+ function mt.__index(t, k) return mt.get(k, {private=true}) end
function mt.__newindex(t, k, v) mt.save(k, v) end
function mt.has_permission(user, permission)