From b737f2b4c393a3a4ff352573e1accdd17e3aa67a Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 24 Feb 2019 16:50:15 +0100 Subject: Revert "rewrite logic to put some key at the beginning of the OrderedDict" This reverts commit adaa6d64c4466cff986e695d9d69d51a4d05ca59. old is undefined and therefore the code is broken. --- devel/forms.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/devel/forms.py b/devel/forms.py index 21ce529e..e6ccf68b 100644 --- a/devel/forms.py +++ b/devel/forms.py @@ -53,11 +53,15 @@ class NewUserForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(NewUserForm, self).__init__(*args, **kwargs) # Hack ourself so certain fields appear first + old = self.fields + self.fields = OrderedDict() keys = ('username', 'private_email', 'first_name', 'last_name', 'alias', 'public_email') - # add all remaining keys afterwards - keys += tuple(k for k in self.fields.keys() if k not in keys) - self.fields = OrderedDict((key, old[key]) for key in keys) + for key in keys: + self.fields[key] = old[key] + for key, _ in list(old.items()): + if key not in keys: + self.fields[key] = old[key] def clean_username(self): username = self.cleaned_data['username'] -- cgit v1.2.3-55-g3dc8