Commit 9607a040 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes... 

Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor.
parent 8e631a31

django/contrib/admin/utils.py

+6 −1
Original line number Diff line number Diff line
@@ -304,9 +304,14 @@ def _get_non_gfk_field(opts, name): 
    """

    For historical reasons, the admin app relies on GenericForeignKeys as being

    "not found" by get_field(). This could likely be cleaned up.



    Reverse relations should also be excluded as these aren't attributes of the

    model (rather something like `foo_set`).

    """

    field = opts.get_field(name)

    if field.is_relation and field.many_to_one and not field.related_model:

    if (field.is_relation and

            # Generic foreign keys OR reverse relations

            ((field.many_to_one and not field.related_model) or field.one_to_many)):

        raise FieldDoesNotExist()

    return field

docs/releases/1.8.5.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,5 +13,9 @@ Bugfixes 
  field that is both a foreign and primary key (:ticket:`24951`).



* Fixed a migrations crash with ``GenericForeignKey`` (:ticket:`25040`).



* Made ``translation.override()`` clear the overridden language when a

  translation isn't initially active (:ticket:`25295`).



* Fixed crash when using a value in ``ModelAdmin.list_display`` that clashed

  with a reverse field on the model (:ticket:`25299`).

tests/admin_views/admin.py

+5 −1
Original line number Diff line number Diff line
@@ -169,7 +169,11 @@ class ThingAdmin(admin.ModelAdmin): 




class InquisitionAdmin(admin.ModelAdmin):

    list_display = ('leader', 'country', 'expected')

    list_display = ('leader', 'country', 'expected', 'sketch')



    def sketch(self, obj):

        # A method with the same name as a reverse accessor.

        return 'list-display-sketch'





class SketchAdmin(admin.ModelAdmin):

tests/admin_views/tests.py

+10 −0
Original line number Diff line number Diff line
@@ -4882,6 +4882,16 @@ class RawIdFieldsTest(TestCase): 
        self.assertNotContains(response2, "Kilbraken")

        self.assertContains(response2, "Palin")



    def test_list_display_method_same_name_as_reverse_accessor(self):

        """

        Should be able to use a ModelAdmin method in list_display that has the

        same name as a reverse model field ("sketch" in this case).

        """

        actor = Actor.objects.create(name="Palin", age=27)

        Inquisition.objects.create(expected=True, leader=actor, country="England")

        response = self.client.get(reverse('admin:admin_views_inquisition_changelist'))

        self.assertContains(response, 'list-display-sketch')





@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],

    ROOT_URLCONF="admin_views.urls")