Ticket #10431: lsaffre_20090307.diff

django/forms/models.py

@@ -143 +143 @@
     Returns a ``SortedDict`` containing form fields for the given model.
 
     ``fields`` is an optional list of field names. If provided, only the named
-    fields will be included in the returned fields.
+    fields will be included in the returned fields. 
 
     ``exclude`` is an optional list of field names. If provided, the named
     fields will be excluded from the returned fields, even if they are listed
     in the ``fields`` argument.
+    
+    If ``fields`` is provided, the returned list will be in that order, 
+    otherwise as defined in the Model.
     """
-    # TODO: if fields is provided, it would be nice to return fields in that order
+    # 
     field_list = []
     opts = model._meta
-    for f in opts.fields + opts.many_to_many:
+    if fields:
+        def search(name):
+            for f in opts.fields + opts.many_to_many:
+                if name == f.name:
+                    return f
+        model_fields = []
+        for fn in fields:
+            f = search(fn)
+            if f:
+                model_fields.append(f)
+            # TODO: Otherwise raise an exception here? Which one?
+    else:
+        model_fields = opts.fields + opts.many_to_many
+    for f in model_fields:
         if not f.editable:
             continue
-        if fields and not f.name in fields:
-            continue
         if exclude and f.name in exclude:
             continue
         formfield = formfield_callback(f)
@@ -164 +178 @@
             field_list.append((f.name, formfield))
     return SortedDict(field_list)
 
+
 class ModelFormOptions(object):
     def __init__(self, options=None):
         self.model = getattr(options, 'model', None)