diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-12-23 17:54:44 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-12-23 17:54:44 +0200 |
| commit | 98ab6360ed44bf6435405fa1808fc34682038928 (patch) | |
| tree | 0dda857046d39b19a7dc19ed39e5d3f88d9e1db3 /addons/document_webdav/nodes.py | |
| parent | 43387c7f430a5109a5f2fcef9dd9c94594c788ff (diff) | |
| parent | 369d1d110b3e5715a3cc74e602539410785d6b7f (diff) | |
Merge branch11 into patch18
Branch patch11 had somewhere been lost in bzr hell.
Conflicts:
account/account_move_line.py
document_webdav/nodes.py
document_webdav/webdav_server.py
event_project/__init__.py
users_ldap/users_ldap.py
bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9
Diffstat (limited to 'addons/document_webdav/nodes.py')
| -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 fc48a47056a..5927eade899 100644 --- a/addons/document_webdav/nodes.py +++ b/addons/document_webdav/nodes.py @@ -299,7 +299,7 @@ class node_file(node_acl_mixin, nodes.node_file): return '' def get_dav_props(self, cr): - return self._get_dav_props_hlpr(cr, nodes.node_dir, + return self._get_dav_props_hlpr(cr, nodes.node_file, 'document.webdav.file.property', 'file_id', self.file_id) def dav_lock(self, cr, lock_data): @@ -345,11 +345,11 @@ class node_database(nodes.node_database): return ('collection', 'DAV:') def get_dav_props(self, cr): - return self._get_dav_props_hlpr(cr, nodes.node_dir, + return self._get_dav_props_hlpr(cr, nodes.node_database, 'document.webdav.dir.property', 'dir_id', False) def get_dav_eprop(self, cr, ns, prop): - return self._get_dav_eprop_hlpr(cr, nodes.node_dir, ns, prop, + return self._get_dav_eprop_hlpr(cr, nodes.node_database, ns, prop, 'document.webdav.dir.property', 'dir_id', False) class node_res_obj(node_acl_mixin, nodes.node_res_obj): |