diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-07-31 12:50:39 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-08-02 10:41:29 -0400 |
| commit | a0ed2f9260f995b0cdf145f2802fc8123c25db65 (patch) | |
| tree | b72b155f386339569d58e13c870edac9a2cc1efe /django | |
| parent | 920b242e307297778c6e5010f23502c4f41f299c (diff) | |
Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets().
Refs 23e1b59 which already fixed this issue for ModelAdmin and InlineModelAdmin.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 6f120f82e0..186f39068d 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -465,10 +465,10 @@ class GenericInlineModelAdmin(InlineModelAdmin): formset = BaseGenericInlineFormSet def get_formset(self, request, obj=None, **kwargs): - if self.declared_fieldsets: - fields = flatten_fieldsets(self.declared_fieldsets) + if 'fields' in kwargs: + fields = kwargs.pop('fields') else: - fields = None + fields = flatten_fieldsets(self.get_fieldsets(request, obj)) if self.exclude is None: exclude = [] else: |