diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 17:26:20 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 17:26:20 +0000 |
| commit | 651082267956cef3bf3dbd48c5314046c14ca01c (patch) | |
| tree | 62bc9798c14d7873b9f6238a896583be0fb8f34b /django | |
| parent | c7117b103a5a2ae50903faf2197ebafb6cd3687a (diff) | |
[1.1.X] Fixed #12561. InlineAdmin now respects can_delete=False. Backport of [12533] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 | ||||
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 21c8a4b277..d2c02c14f3 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1121,6 +1121,7 @@ class InlineModelAdmin(BaseModelAdmin): template = None verbose_name = None verbose_name_plural = None + can_delete = True def __init__(self, parent_model, admin_site): self.admin_site = admin_site @@ -1163,6 +1164,7 @@ class InlineModelAdmin(BaseModelAdmin): "formfield_callback": curry(self.formfield_for_dbfield, request=request), "extra": self.extra, "max_num": self.max_num, + "can_delete": self.can_delete, } defaults.update(kwargs) return inlineformset_factory(self.parent_model, self.model, **defaults) diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 6ce03bdf62..a834a44267 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -386,7 +386,7 @@ class GenericInlineModelAdmin(InlineModelAdmin): "formfield_callback": self.formfield_for_dbfield, "formset": self.formset, "extra": self.extra, - "can_delete": True, + "can_delete": self.can_delete, "can_order": False, "fields": fields, "max_num": self.max_num, |