Commit 32c85790 authored by Tim Graham's avatar Tim Graham
Browse files

[1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 

(the previous commit included only the test)

Backport of 3cba90f2 from master
parent 5e74d6cf

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -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):