Ticket #5986: django-fields-order.patch

newforms/forms.py

@@ -8 +8 @@
 from django.utils.html import escape
 from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
 from django.utils.safestring import mark_safe
+from django.core.management.base import CommandError
 
 from fields import Field
 from widgets import TextInput, Textarea
@@ -38 +39 @@
             if hasattr(base, 'base_fields'):
                 fields = base.base_fields.items() + fields
 
+        # Sort by Meta.fields_order if present.
+        # Raises CommandError if any of the fields is missing.
+        if attrs.has_key('Meta') and hasattr(attrs['Meta'], 'fields_order'):
+            def _indexcmp(x, y):
+                errstr = "%s not present in %s.Meta.fields_order"
+                try:
+                    xindex = attrs['Meta'].fields_order.index(x[0])
+                except ValueError:
+                    raise CommandError, errstr % (x[0], name)
+                try:
+                    yindex = attrs['Meta'].fields_order.index(y[0])
+                except ValueError:
+                    raise CommandError, errstr % (y[0], name)
+                return cmp(xindex, yindex)
+            fields.sort(_indexcmp)
+
         attrs['base_fields'] = SortedDict(fields)
         return type.__new__(cls, name, bases, attrs)