From 3cc67a637a3cd1426d2ac87d7418600fa247ebb2 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 24 Aug 2015 11:52:58 -0400 Subject: [1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor. Backport of 9607a0404188bbe612f05216f5a82df26f4b4e80 from master --- docs/releases/1.8.5.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt index 3f1674b979..543e8824be 100644 --- a/docs/releases/1.8.5.txt +++ b/docs/releases/1.8.5.txt @@ -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`). -- cgit v1.3