Merge "Fix getting defaults from cookie for region field in password form"

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):

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.