diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-24 01:21:28 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-25 09:02:58 +0200 |
commit | f7a552e3b3c71e42129dab3a3348334c046537b6 (patch) | |
tree | 4ac7403e2e7faf5de3d71712b33190ec90a15919 /aconf/model | |
parent | bdcf6ff099f1acd7e2370a2478b5b4a5eac7dea0 (diff) | |
download | aconf-f7a552e3b3c71e42129dab3a3348334c046537b6.tar.bz2 aconf-f7a552e3b3c71e42129dab3a3348334c046537b6.tar.xz |
model: harmonize signatures of Model.init and RootModel.init
Diffstat (limited to 'aconf/model')
-rw-r--r-- | aconf/model/root.lua | 8 |
1 files changed, 5 insertions, 3 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) |