symposion_app Changeset - fa66316f8aca

Changeset - fa66316f8aca

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Hiroshi Miura - 9 years ago 2015-07-20 02:54:30
miurahr@linux.com

form key ordering: detect django version

- Django 1.6 and before use SortedDict instead of OrderedDict
It detect version and return proper dict for key ordering.
- field deletion is done by reorder funcion.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

1 file changed with 8 insertions and 2 deletions:

symposion/forms.py

0 comments (0 inline, 0 general)

symposion/forms.py

➞

Show inline comments

 from collections import OrderedDict
 from django import forms
 from django import VERSION as django_VERSION
 import account.forms
 class SignupForm(account.forms.SignupForm):
     first_name = forms.CharField()
     last_name = forms.CharField()
     email_confirm = forms.EmailField(label="Confirm Email")
     def __init__(self, *args, **kwargs):
         super(SignupForm, self).__init__(*args, **kwargs)
         del self.fields["username"]
         key_order = [
             "email",
             "email_confirm",
             "first_name",
             "last_name",
             "password",
             "password_confirm"
+        ]
         self.fields = reorder_fields(self.fields, key_order)
     def clean_email_confirm(self):
         email = self.cleaned_data.get("email")
@@ ... / @@ -37,13 +37,19 @@ class SignupForm(account.forms.SignupForm): @@
 def reorder_fields(fields, order):
     """Reorder form fields by order, removing items not in order.
     >>> reorder_fields(
     ...     OrderedDict([('a', 1), ('b', 2), ('c', 3)]),
     ...     ['b', 'c', 'a'])
     OrderedDict([('b', 2), ('c', 3), ('a', 1)])
     """
     for key, v in fields.items():
         if key not in order:
             del fields[key]
     return OrderedDict(sorted(fields.items(), key=lambda k: order.index(k[0])))
     if django_VERSION < (1, 7, 0):
         # fields is SortedDict
         fields.keyOrder.sort(key=lambda k: order.index(k[0]))
         return fields
     else:
         # fields is OrderedDict
         return OrderedDict(sorted(fields.items(), key=lambda k: order.index(k[0])))

0 comments (0 inline, 0 general)