projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18cd757
)
[FIX] When using apache https as proxy for openerp accesing /mobile url leads to...
author
mikel
<mikel@pcl2>
Tue, 14 Feb 2012 22:06:15 +0000
(23:06 +0100)
committer
mikel
<mikel@pcl2>
Tue, 14 Feb 2012 22:06:15 +0000
(23:06 +0100)
bzr revid: mikel@pcl2-
20120214220615
-j28302zaeoewdan6
addons/web_mobile/static/src/web_mobile.html
patch
|
blob
|
history
diff --git
a/addons/web_mobile/static/src/web_mobile.html
b/addons/web_mobile/static/src/web_mobile.html
index
b0e7807
..
f3aab5e
100755
(executable)
--- a/
addons/web_mobile/static/src/web_mobile.html
+++ b/
addons/web_mobile/static/src/web_mobile.html
@@
-50,7
+50,10
@@
<script type="text/javascript">
\r
var QWeb;
\r
$(function() {
\r
- if(document.URL!="http://"+window.location.host+"/web_mobile/static/src/web_mobile.html"){
\r
+ if(
\r
+ document.URL!="http://"+window.location.host+"/web_mobile/static/src/web_mobile.html" &&
\r
+ document.URL!="https://"+window.location.host+"/web_mobile/static/src/web_mobile.html"
\r
+ ){
\r
window.location.replace('/mobile');
\r
}
\r
var oe = openerp.init();
\r