summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJustin Caratzas <bigjust@lambdaphil.es>2014-09-22 17:29:44 -0400
committerTim Graham <timograham@gmail.com>2014-09-24 06:32:42 -0400
commitcf43a1ee909ab5dbca5b6a40247cd093a3e2ac8d (patch)
treeb2c16996ce62f285685b2348020b3f9bed285721 /django
parent2f3a4cd573166e6b7bac9ed89d448ca34ab93edf (diff)
Fixed #23539 -- Added get_extra(), get_max_num(), and get_min_num() hooks to GenericInlineModelAdmin.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/admin.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/admin.py b/django/contrib/contenttypes/admin.py
index 1938fa7aae..3ad4c86ee8 100644
--- a/django/contrib/contenttypes/admin.py
+++ b/django/contrib/contenttypes/admin.py
@@ -115,12 +115,12 @@ class GenericInlineModelAdmin(InlineModelAdmin):
"form": self.form,
"formfield_callback": partial(self.formfield_for_dbfield, request=request),
"formset": self.formset,
- "extra": self.extra,
+ "extra": self.get_extra(request, obj),
"can_delete": can_delete,
"can_order": False,
"fields": fields,
- "min_num": self.min_num,
- "max_num": self.max_num,
+ "min_num": self.get_min_num(request, obj),
+ "max_num": self.get_max_num(request, obj),
"exclude": exclude
}
defaults.update(kwargs)