From: mikel <mikel@pcl2>
Date: Tue, 14 Feb 2012 22:06:15 +0000 (+0100)
Subject: [FIX] When using apache https as proxy for openerp accesing /mobile url leads to... 
X-Git-Tag: 6.1.0-web~40^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=112070a58f174eedfca08a046423989e7bca3b0f;p=odoo%2Fodoo.git

[FIX] When using apache https as proxy for openerp accesing /mobile url leads to redirection loop. This change, 1 line solves the problem.

bzr revid: mikel@pcl2-20120214220615-j28302zaeoewdan6
---

diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index b0e7807..f3aab5e 100755
--- 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">
         var QWeb;
         $(function() {
-            if(document.URL!="http://"+window.location.host+"/web_mobile/static/src/web_mobile.html"){
+            if(
+                document.URL!="http://"+window.location.host+"/web_mobile/static/src/web_mobile.html" &&
+                document.URL!="https://"+window.location.host+"/web_mobile/static/src/web_mobile.html"                
+            ){
                 window.location.replace('/mobile');
             }
             var oe = openerp.init();