diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-02-01 14:13:21 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-02-01 14:13:21 +0000 |
| commit | be90eadfb98b7f7115a5e19e141e522aefd3f69f (patch) | |
| tree | a9a7da79b70d41c0504d71ec4f666b7112b67f2d | |
| parent | 267346678d6fe2bbccf7394bae3c380af1a3a25c (diff) | |
Fixed #12628 - Don't ignore read-only fields in GenericInlineModelAdmin during save. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 705b62e7cf..602b337e6b 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -379,6 +379,12 @@ class GenericInlineModelAdmin(InlineModelAdmin): fields = flatten_fieldsets(self.declared_fieldsets) else: fields = None + if self.exclude is None: + exclude = [] + else: + exclude = list(self.exclude) + exclude.extend(self.get_readonly_fields(request, obj)) + exclude = exclude or None defaults = { "ct_field": self.ct_field, "fk_field": self.ct_fk_field, @@ -390,7 +396,7 @@ class GenericInlineModelAdmin(InlineModelAdmin): "can_order": False, "fields": fields, "max_num": self.max_num, - "exclude": self.exclude + "exclude": exclude } return generic_inlineformset_factory(self.model, **defaults) |