summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-01-27 12:30:33 +0100
committerXavier Morel <xmo@openerp.com>2012-01-27 12:30:33 +0100
commitc5c224752fc0d58d2f48dedbd5fa0e0acb3fe264 (patch)
tree3b9c9dab65a7ed565923cf8c8632033ff33bb948
parentbc2823b926ae3a38170c3740ebb3da6314f18c75 (diff)
[FIX] CSS paths adaptation when running openerp-web (python side) in Windows
lp bug: https://launchpad.net/bugs/920938 fixed bzr revid: xmo@openerp.com-20120127113033-5jb9bcfothcd30ly
-rw-r--r--addons/web/controllers/main.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 218f1fc0284..a5fe8eda60a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -164,8 +164,9 @@ class WebClient(openerpweb.Controller):
with open(f) as fp:
data = fp.read()
- web_path = file_map[f]
- web_dir = os.path.dirname(web_path)
+ path = file_map[f]
+ # convert FS path into web path
+ web_dir = '/'.join(os.path.dirname(path).split(os.path.sep))
data = re.sub(
rx_import,