From 69f385414a86154a2486956e58fd174e7ac349bd Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 15 Nov 2012 16:12:28 +0100
Subject: [PATCH] [FIX] manifest_glob return path with / for web part

bzr revid: chs@openerp.com-20121115151228-xzrlpjxwkspf5fgz
---
 addons/web/controllers/main.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 717ede144eb..0b3d5341b11 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -263,6 +263,10 @@ def concat_js(file_list):
     content = rjsmin(content)
     return content, checksum 
 
+def fs2web(path):
+    """convert FS path into web path"""
+    return '/'.join(path.split(os.path.sep))
+
 def manifest_glob(req, addons, key):
     if addons is None:
         addons = module_boot(req)
@@ -278,7 +282,7 @@ def manifest_glob(req, addons, key):
         globlist = manifest.get(key, [])
         for pattern in globlist:
             for path in glob.glob(os.path.normpath(os.path.join(addons_path, addon, pattern))):
-                r.append((path, path[len(addons_path):]))
+                r.append((path, fs2web(path[len(addons_path):])))
     return r
 
 def manifest_list(req, mods, extension):
@@ -638,8 +642,7 @@ class WebClient(openerpweb.Controller):
                 data = fp.read().decode('utf-8')
 
             path = file_map[f]
-            # convert FS path into web path
-            web_dir = '/'.join(os.path.dirname(path).split(os.path.sep))
+            web_dir = os.path.dirname(path)
 
             data = re.sub(
                 rx_import,