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
This commit is contained in:
Kieran Spear 2013-03-06 14:37:30 +11:00
parent f754398492
commit 6db859c849
3 changed files with 3 additions and 3 deletions

View File

@ -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>

View File

@ -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 {

View File

@ -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