summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-04-07 09:04:49 -0400
committerTim Graham <timograham@gmail.com>2014-04-07 09:06:09 -0400
commit32c857908998503cd595311eebc9256d44f65803 (patch)
tree9acc23110f02d4e44efe29c15e9d58341763595d
parent5e74d6cf0a4fa0caa51e77af77d55c2572f0917d (diff)
[1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries.
(the previous commit included only the test) Backport of 3cba90f22a from master
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index c67c7dc7c8..a9169936b4 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -59,7 +59,7 @@ def get_content_type_for_model(obj):
# Since this module gets imported in the application's root package,
# it cannot import models from other applications at the module level.
from django.contrib.contenttypes.models import ContentType
- return ContentType.objects.get_for_model(obj)
+ return ContentType.objects.get_for_model(obj, for_concrete_model=False)
def get_ul_class(radio_style):