diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-08 13:52:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-08 13:52:51 +0000 |
| commit | fbc9f44fa6ef694e090ec239123f10b449469253 (patch) | |
| tree | 8abe17dcabe6ba71927a7e4f679efa7d2ac1a206 | |
| parent | 9873655c0518b4ebd3100b26036f8fcfbe29a17f (diff) | |
| parent | 88dd887ad3284601f0acec89cf52265602a70c8c (diff) | |
| download | horizon-fbc9f44fa6ef694e090ec239123f10b449469253.tar.gz | |
Merge "Fix getting defaults from cookie for region field in password form"
| -rw-r--r-- | openstack_auth/forms.py | 3 | ||||
| -rw-r--r-- | openstack_auth/views.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py index 74feb331e..7154069c2 100644 --- a/openstack_auth/forms.py +++ b/openstack_auth/forms.py @@ -209,9 +209,6 @@ class Password(forms.Form): if len(self.fields['region'].choices) == 1: self.fields['region'].initial = self.fields['region'].choices[0][0] self.fields['region'].widget = forms.widgets.HiddenInput() - elif len(self.fields['region'].choices) > 1: - self.fields['region'].initial = self.request.COOKIES.get( - 'login_region') @sensitive_variables('password', 'confirm_password', 'original_password') def clean(self): diff --git a/openstack_auth/views.py b/openstack_auth/views.py index 986817561..7f6ef1fdc 100644 --- a/openstack_auth/views.py +++ b/openstack_auth/views.py @@ -460,7 +460,10 @@ class PasswordView(edit_views.FormView): success_url = settings.LOGIN_URL def get_initial(self): - return {'user_id': self.kwargs['user_id']} + return { + 'user_id': self.kwargs['user_id'], + 'region': self.request.COOKIES.get('login_region'), + } def form_valid(self, form): # We have no session here, so regular messages don't work. |