Ticket #6369: modelfield_order_2.diff

django/newforms/models.py

@@ -257 +257 @@
             attrs['base_fields'] = model_fields
         else:
             attrs['base_fields'] = declared_fields
+        if opts.fields:
+            attrs['base_fields'].keyOrder = [key for key in opts.fields if key in attrs['base_fields'].keyOrder]
         return type.__new__(cls, name, bases, attrs)
 
 class BaseModelForm(BaseForm):