diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-07-03 17:56:33 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-07-03 17:56:33 +0000 |
| commit | f9fe112f2d65ea187ad47b280197664b551f339e (patch) | |
| tree | 4ef7f543bcd43cdfac118eaa84c5adfa616ca23e /django | |
| parent | 43cb78fafde45fae9e057d29878c2ebf40aef873 (diff) | |
Fixed #15820 -- Fixed the use of the InlineAdmin's get_formset method by actually passing in the obj. Thanks, Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 703421f1bc..772734aae4 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1360,7 +1360,7 @@ class InlineModelAdmin(BaseModelAdmin): def get_fieldsets(self, request, obj=None): if self.declared_fieldsets: return self.declared_fieldsets - form = self.get_formset(request).form + form = self.get_formset(request, obj).form fields = form.base_fields.keys() + list(self.get_readonly_fields(request, obj)) return [(None, {'fields': fields})] |