odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] manifest_glob return path with / for web part 

bzr revid: chs@openerp.com-20121115151228-xzrlpjxwkspf5fgz
This commit is contained in:
Christophe Simonis 2012-11-15 16:12:28 +01:00
parent 8a3d2c4744
commit 69f385414a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web/controllers/main.py
View File

@ -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,