← Back to branch summary

~zulcss/horizon/horizon-g3-precise

« back to all changes in this revision

Viewing changes to horizon/views/auth_forms.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-06-01 10:57:56 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120601105756-dif0km7n98vhdi2x
Tags: 2012.2~f2~20120530.1777-0ubuntu1
* New upstream release. 
* debian/patches/add_juju_settings_panel.patch: Refreshed
* debian/patches/turn-off-debug.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
horizon/views/auth_forms.py
29
29
from django.contrib import messages
30
30
from django.contrib.auth import REDIRECT_FIELD_NAME
31
31
from django.utils.translation import ugettext as _
 
32
from django.views.decorators.debug import sensitive_variables
 
33
 
32
34
from keystoneclient import exceptions as keystone_exceptions
33
35
 
34
36
from horizon import api
76
78
            self.fields['region'].initial = default_region[0]
77
79
            self.fields['region'].widget = forms.widgets.HiddenInput()
78
80
 
 
81
    @sensitive_variables("data")
79
82
    def handle(self, request, data):
80
83
        if 'user_name' in request.session:
81
84
            if request.session['user_name'] != data['username']:
90
93
        # For now we'll allow fallback to OPENSTACK_KEYSTONE_URL if the
91
94
        # form post doesn't include a region.
92
95
        endpoint = data.get('region', None) or settings.OPENSTACK_KEYSTONE_URL
93
 
        region_name = dict(self.fields['region'].choices)[endpoint]
94
 
        request.session['region_endpoint'] = endpoint
95
 
        request.session['region_name'] = region_name
 
96
        if endpoint != request.session.get('region_endpoint', None):
 
97
            region_name = dict(self.fields['region'].choices)[endpoint]
 
98
            request.session['region_endpoint'] = endpoint
 
99
            request.session['region_name'] = region_name
 
100
            request.user.service_catalog = None
96
101
 
97
102
        redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, "")
98
103