Fix inability to switch region via Switch Region dropdown

Prevent logged-in users redirect in case 'login'
view is used for switching the regions via modal form.

Change-Id: I47f26eea19e577998c7e3906a51900b51024eb43
Related-Bug: #1381413

1 files changed, 9 insertions, 8 deletions

diff --git a/openstack_auth/views.py b/openstack_auth/views.py
index e7ea1e8..938d720 100644
--- a/openstack_auth/views.py
+++ b/openstack_auth/views.py
@@ -49,14 +49,15 @@ LOG = logging.getLogger(__name__)
 @never_cache
 def login(request, template_name=None, extra_context=None, **kwargs):
     """Logs a user in using the :class:`~openstack_auth.forms.Login` form."""
-    # If the user is already authenticated, redirect them to the
-    # dashboard straight away, unless the 'next' parameter is set as it
-    # usually indicates requesting access to a page that requires different
-    # permissions.
-    if (request.user.is_authenticated() and
-            auth.REDIRECT_FIELD_NAME not in request.GET and
-            auth.REDIRECT_FIELD_NAME not in request.POST):
-        return shortcuts.redirect(settings.LOGIN_REDIRECT_URL)
+    if not request.is_ajax():
+        # If the user is already authenticated, redirect them to the
+        # dashboard straight away, unless the 'next' parameter is set as it
+        # usually indicates requesting access to a page that requires different
+        # permissions.
+        if (request.user.is_authenticated() and
+                auth.REDIRECT_FIELD_NAME not in request.GET and
+                auth.REDIRECT_FIELD_NAME not in request.POST):
+            return shortcuts.redirect(settings.LOGIN_REDIRECT_URL)
 
     # Get our initial region for the form.
     initial = {}