diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
commit | ea00a099dffd7157c93af54b5817734348d2bbc6 (patch) | |
tree | 89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /devel/forms.py | |
parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
parent | 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff) |
Merge branch 'archweb' into archweb-generic
Conflicts:
templates/public/download.html
templates/public/index.html
Diffstat (limited to 'devel/forms.py')
-rw-r--r-- | devel/forms.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/devel/forms.py b/devel/forms.py index 7f7c281e..d953c614 100644 --- a/devel/forms.py +++ b/devel/forms.py @@ -1,4 +1,5 @@ import random +from collections import OrderedDict from string import ascii_letters, digits from django import forms @@ -52,13 +53,16 @@ class NewUserForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(NewUserForm, self).__init__(*args, **kwargs) - # Hack ourself so certain fields appear first. self.fields is a - # SortedDict object where we can manipulate the keyOrder list. - order = self.fields.keyOrder - keys = ('username', 'private_email', 'first_name', 'last_name') - for key in reversed(keys): - order.remove(key) - order.insert(0, key) + # Hack ourself so certain fields appear first + old = self.fields + self.fields = OrderedDict() + keys = ('username', 'private_email', 'first_name', 'last_name', + 'alias', 'public_email') + for key in keys: + self.fields[key] = old[key] + for key, val in old.items(): + if key not in keys: + self.fields[key] = old[key] def clean_username(self): username = self.cleaned_data['username'] |