diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-15 12:34:31 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-15 12:34:31 +0200 |
| commit | ed4b70dfe33605fde42cccd788bb0f43ffefbec6 (patch) | |
| tree | 970ec3a89a382a0d2d8182710081206fb815ef4d /addons/document_webdav | |
| parent | 177f51cb541f6f635d445ca24ce4453d79eb6d39 (diff) | |
| parent | 53f168daaf989d97a4e514934afc7fe04d21193b (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130415103431-y96fhba0502b6aqc
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/nodes.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py index 5e819e01754..9a35f3cfe1b 100644 --- a/addons/document_webdav/nodes.py +++ b/addons/document_webdav/nodes.py @@ -67,7 +67,7 @@ class node_acl_mixin(object): """ ret = par_class.get_dav_props(self, cr) if prop_model: - propobj = self.context._dirobj.pool.get(prop_model) + propobj = self.context._dirobj.pool[prop_model] uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) @@ -105,7 +105,7 @@ class node_acl_mixin(object): if ret is not None: return ret if prop_model: - propobj = self.context._dirobj.pool.get(prop_model) + propobj = self.context._dirobj.pool[prop_model] uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) @@ -151,7 +151,7 @@ class node_acl_mixin(object): assert prop_model assert res_id assert isinstance(lock_data, dict), '%r' % lock_data - propobj = self.context._dirobj.pool.get(prop_model) + propobj = self.context._dirobj.pool[prop_model] uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) |