Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.0-bug-776411-xrg into lp:openobject-addons/6.0

  1. 6.0-bug-776411-xrg
  2. Merge into 6.0
Proposed by xrg
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-bug-776411-xrg
Merge into: lp:openobject-addons/6.0
Diff against target: 19 lines (+3/-3)
1 file modified
document_webdav/webdav_server.py (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-bug-776411-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+59785@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'document_webdav/webdav_server.py'
2--- document_webdav/webdav_server.py 2011-01-14 09:34:28 +0000
3+++ document_webdav/webdav_server.py 2011-05-03 14:23:56 +0000
4@@ -585,12 +585,12 @@
5 if config.get_misc('static-http','enable', False):
6 base_path = config.get_misc('static-http', 'base_path', '/')
7 if base_path and base_path == '/':
8- dir_path = config.get_misc('static-http', 'dir_path', False)
9+ dir_path = config.get('static_http_document_root', False)
10 else:
11 dir_path = addons.get_module_resource('document_webdav','public_html')
12- # an _ugly_ hack: we put that dir back in tools.config.misc, so that
13+ # an _ugly_ hack: we put that dir back in tools.config, so that
14 # the StaticHttpHandler can find its dir_path.
15- config.misc.setdefault('static-http',{})['dir_path'] = dir_path
16+ config['static_http_document_root'] = dir_path
17
18 if reg_http_service(HTTPDir('/', DAVStaticHandler)):
19 logging.getLogger("web-services").info("WebDAV registered HTTP dir %s for /" % \