From a0ed2f9260f995b0cdf145f2802fc8123c25db65 Mon Sep 17 00:00:00 2001
From: Loic Bistuer <loic.bistuer@sixmedia.com>
Date: Wed, 31 Jul 2013 12:50:39 +0700
Subject: Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer
 bypasses get_fieldsets().

Refs 23e1b59 which already fixed this issue for ModelAdmin and InlineModelAdmin.
---
 django/contrib/contenttypes/generic.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'django')

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:
-- 
cgit v1.3