openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-776411-xrg into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #776411 in OpenERP Addons: "webdav: fix config option name, breaking 404 requests"
  https://bugs.launchpad.net/openobject-addons/+bug/776411

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-776411-xrg/+merge/59785
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-776411-xrg/+merge/59785
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-776411-xrg.

=== modified file 'document_webdav/webdav_server.py'
--- document_webdav/webdav_server.py	2011-01-14 09:34:28 +0000
+++ document_webdav/webdav_server.py	2011-05-03 14:21:34 +0000
@@ -585,12 +585,12 @@
             if config.get_misc('static-http','enable', False):
                 base_path = config.get_misc('static-http', 'base_path', '/')
             if base_path and base_path == '/':
-                dir_path = config.get_misc('static-http', 'dir_path', False)
+                dir_path = config.get('static_http_document_root', False)
             else:
                 dir_path = addons.get_module_resource('document_webdav','public_html')
-                # an _ugly_ hack: we put that dir back in tools.config.misc, so that
+                # an _ugly_ hack: we put that dir back in tools.config, so that
                 # the StaticHttpHandler can find its dir_path.
-                config.misc.setdefault('static-http',{})['dir_path'] = dir_path
+                config['static_http_document_root'] = dir_path
     
             if reg_http_service(HTTPDir('/', DAVStaticHandler)):
                 logging.getLogger("web-services").info("WebDAV registered HTTP dir %s for /" % \