Merge pull request #960 from camptocamp/mobile-logout

Fix login / logout on mobile
camptocamp · May 23, 2014 · 6262ed3 · 6262ed3
2 parents 0f52902 + 97c58cc
commit 6262ed3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/c2cgeoportal/scaffolds/update/+package+/static/mobile/app/controller/Main.js b/c2cgeoportal/scaffolds/update/+package+/static/mobile/app/controller/Main.js
@@ -176,7 +176,16 @@ Ext.define('App.controller.Main', {
     },
 
     logout: function() {
-        window.location = App.logoutUrl;
+        Ext.Ajax.request({
+            url: App.logoutUrl,
+            success: function(response) {
+                var sep = App.cameFrom.indexOf('?') > 0 ? '&' : '?';
+                window.location = App.cameFrom + sep + 'v=' + Math.round(Math.random() * 1000000);
+            },
+            failure: function(response, opts) {
+                Ext.Msg.alert(response.statusText);
+            }
+        });
     },
 
     recenterMap: function(f) {

diff --git a/c2cgeoportal/scaffolds/update/+package+/static/mobile/app/view/LoginForm.js b/c2cgeoportal/scaffolds/update/+package+/static/mobile/app/view/LoginForm.js
@@ -33,7 +33,8 @@ Ext.define('App.view.LoginForm', {
         listeners: {
             exception: function (self, result, eOpts) {
                 if (result === true) {
-                    window.location = App.cameFrom;
+                    var sep = App.cameFrom.indexOf('?') > 0 ? '&' : '?';
+                    window.location = App.cameFrom + sep + 'v=' + Math.round(Math.random() * 1000000);
                 }
                 else {
                     if (result.status == 401) {

diff --git a/c2cgeoportal/scaffolds/update/+package+/static/mobile/index.html_tmpl b/c2cgeoportal/scaffolds/update/+package+/static/mobile/index.html_tmpl
@@ -72,8 +72,8 @@
         App.wmsUrl = "${request.route_url('mapserverproxy', path='')}";
         App.rasterUrl = "${request.route_url('raster', path='')}";
         App.loginUrl = "${request.route_url('login', path='')}";
+        App.logoutUrl = "${request.route_url('logout', path='')}";
         App.cameFrom = "${came_from}";
-        App.logoutUrl = "${request.route_url('logout', _query={'came_from': came_from})}";
         App.desktopAppUrl = "${request.route_url('home', path='', _query={'no_redirect':''})}";
     </script>
     <script type="text/javascript" src="openlayers-mobile.js"></script>