Ticket #15907: 15907_patch.diff

django/forms/models.py

@@ -384 +384 @@
     # creating needs to inherit from the parent's inner meta.
     parent = (object,)
     if hasattr(form, 'Meta'):
+        if 'fields' in attrs and hasattr(form.Meta, 'fields'):
+            all_fields = tuple(attrs['fields']) + tuple(form.Meta.fields)
+            attrs['fields'] = tuple(set(all_fields))
+
+        if 'exclude' in attrs and hasattr(form.Meta, 'exclude'):
+            all_exclude = tuple(attrs['exclude']) + tuple(form.Meta.exclude)
+            attrs['exclude'] = tuple(set(all_exclude))
         parent = (form.Meta, object)
     Meta = type('Meta', parent, attrs)
 
@@ -1022 +1029 @@
         if hasattr(value, '__iter__'):
             return [super(ModelMultipleChoiceField, self).prepare_value(v) for v in value]
         return super(ModelMultipleChoiceField, self).prepare_value(value)
+