Ticket #6369: modelfield_order_3.2.diff

django/newforms/models.py

@@ -257 +257 @@
             attrs['base_fields'] = model_fields
         else:
             attrs['base_fields'] = declared_fields
+        # If Meta defines fields, they should be outputed in the order specified.
+        # But first check to ensure that all items in Meta.fields actually exist.
+        if opts.fields:
+            for key in opts.fields:
+                if not key in attrs['base_fields'].keyOrder:
+                    raise ImproperlyConfigured("%s's Meta.fields contains an invalid value: %s" % (name, key))
+            attrs['base_fields'].keyOrder = opts.fields
         return type.__new__(cls, name, bases, attrs)
 
 class BaseModelForm(BaseForm):