test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Tim Graham 2014-04-07 09:04:49 -04:00
parent 5e74d6cf0a
commit 32c8579089
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/options.py
View File

@ -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):