diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-15 10:30:00 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-15 10:30:00 +0200 |
| commit | 16ea25646e2a9cbfdbdd9c640508533efa0df324 (patch) | |
| tree | 5dbf280557deb155fa1c06f6c4a8a55ae7a7e320 /addons/document_webdav | |
| parent | a027590d6eca9b65c2fdfe5a2509137e839e42ff (diff) | |
| parent | b5b6dfbbf0e3defc9a823ddb7ecc8aaeb9f07c0b (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130515083000-3b033tyihxmubykh
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/test/webdav_test1.yml | 5 | ||||
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/document_webdav/test/webdav_test1.yml b/addons/document_webdav/test/webdav_test1.yml index 82236f63846..ae91d7cd4a8 100644 --- a/addons/document_webdav/test/webdav_test1.yml +++ b/addons/document_webdav/test/webdav_test1.yml @@ -47,10 +47,9 @@ - !python {model: ir.attachment}: | from document_webdav import test_davclient as te - import addons dc = te.DAVClient() dc.get_creds(self, cr, uid) - tdp = addons.get_module_resource('document_webdav', 'test_davclient.py') + tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py') res = dc.gd_put(path=cr.dbname+'/Documents/test_davclient.py', srcpath=tdp) - I will try to get the file from the root @@ -60,5 +59,5 @@ import addons dc = te.DAVClient() dc.get_creds(self, cr, uid) - tdp = addons.get_module_resource('document_webdav', 'test_davclient.py') + tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py') res = dc.gd_get(path=cr.dbname+'/Documents/test_davclient.py', crange=(4,508), compare=tdp) diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 1804b9bfdb2..f67de272e29 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -608,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 |