diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-23 17:29:43 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-23 17:29:43 +0200 |
| commit | 300a2aaeeec4147c4d543a0142ba61bd558036bf (patch) | |
| tree | fec46071455255c24260d3186ac1d5a6b23a1355 /addons/document_webdav/webdav_server.py | |
| parent | 809ec6e49f0eb328f318ce08e4baa2a87fa3db67 (diff) | |
| parent | 8590e68b2b399394c8b0541e885949fc40bca898 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130423152943-8qbm6nhc9ubds5td
Diffstat (limited to 'addons/document_webdav/webdav_server.py')
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 90b42fd8b5f..f67de272e29 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -36,7 +36,6 @@ import logging import openerp -from openerp import netsvc from dav_fs import openerp_dav_handler from openerp.tools.config import config try: @@ -609,7 +608,7 @@ try: if base_path and base_path == '/': dir_path = config.get_misc('static-http', 'dir_path', False) else: - dir_path = openerp.addons.get_module_resource('document_webdav','public_html') + dir_path = openerp.modules.module.get_module_resource('document_webdav','public_html') # an _ugly_ hack: we put that dir back in tools.config.misc, so that # the StaticHttpHandler can find its dir_path. config.misc.setdefault('static-http',{})['dir_path'] = dir_path |