From 6db859c849d522fe8d895f2eefd220a5498dc0fd Mon Sep 17 00:00:00 2001
From: Kieran Spear <kispear@gmail.com>
Date: Wed, 6 Mar 2013 14:37:30 +1100
Subject: [PATCH] Don't change dashboard on admin tenant switch

Switching projects as an admin user currently dumps you back to
the Admin dashboard tab. This change fixes that by adding a 'next'
parameter to the switching URL that points to the default panel
of the current dashboard.

The redirect is to the default panel rather than the current one,
since the next tenant may not have access to the current panel
and we want to avoid kicking a user back to the login screen.

Fixes bug #1072848.

Change-Id: I25b8c0e38945d5db57f5bfe7bb174cdbd66156d5
---
 horizon/templates/horizon/common/_sidebar.html | 2 +-
 run_tests.sh                                   | 2 +-
 tools/pip-requires                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/horizon/templates/horizon/common/_sidebar.html b/horizon/templates/horizon/common/_sidebar.html
index 4d2c71b65..4b0844b9d 100644
--- a/horizon/templates/horizon/common/_sidebar.html
+++ b/horizon/templates/horizon/common/_sidebar.html
@@ -22,7 +22,7 @@
           <li class='divider'></li>
           {% for tenant in authorized_tenants %}
             {% if tenant.enabled and tenant.id != request.user.tenant_id %}
-              <li><a href="{% url switch_tenants tenant.id %}">{{ tenant.name }}</a></li>
+              <li><a href="{% url switch_tenants tenant.id %}?next={{ request.horizon.dashboard.get_absolute_url }}">{{ tenant.name }}</a></li>
             {% endif %}
           {% endfor %}
         </ul>
diff --git a/run_tests.sh b/run_tests.sh
index d3357c146..0df3ccf85 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -6,7 +6,7 @@ set -o errexit
 # Increment me any time the environment should be rebuilt.
 # This includes dependncy changes, directory renames, etc.
 # Simple integer secuence: 1, 2, 3...
-environment_version=29
+environment_version=30
 #--------------------------------------------------------#
 
 function usage {
diff --git a/tools/pip-requires b/tools/pip-requires
index c4b30f93f..6736c7c73 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,7 +1,7 @@
 # Horizon Core Requirements
 Django>=1.4,<1.5
 django_compressor
-django_openstack_auth>=1.0.3
+django_openstack_auth>=1.0.7
 netaddr
 python-cinderclient
 python-glanceclient<2