summaryrefslogtreecommitdiffstats
path: root/aconf
diff options
context:
space:
mode:
Diffstat (limited to 'aconf')
-rw-r--r--aconf/model/root.lua8
-rw-r--r--aconf/transaction/init.lua2
2 files changed, 6 insertions, 4 deletions
diff --git a/aconf/model/root.lua b/aconf/model/root.lua
index 027b2e2..d92ac2d 100644
--- a/aconf/model/root.lua
+++ b/aconf/model/root.lua
@@ -16,8 +16,10 @@ local setdefault = util.setdefault
M.RootModel = model.new()
-function M.RootModel:init(txn)
- object.super(self, M.RootModel):init{txn=txn, path='/', addr='/null'}
+function M.RootModel:init(context)
+ object.super(self, M.RootModel):init(
+ util.update(context, {path='/', addr='/null'})
+ )
end
function M.RootModel:has_permission(user, permission)
@@ -62,7 +64,7 @@ function M.register(name, field, params)
params.create = true
M.RootModel[name] = model.to_field(field, params)
- local root = M.RootModel()
+ local root = M.RootModel{}
for _, record in ipairs(node.topology(root:fetch(name))) do
local top = M.topology(record.addr, true)
diff --git a/aconf/transaction/init.lua b/aconf/transaction/init.lua
index cd7fc5f..aba1b66 100644
--- a/aconf/transaction/init.lua
+++ b/aconf/transaction/init.lua
@@ -25,7 +25,7 @@ function ModelTransaction:init(backend, validate)
self.validate = validate
self.validable = {}
- self.root = root.RootModel(self)
+ self.root = root.RootModel{txn=self}
end
function ModelTransaction:committing()