From 5770c2382a4ebeebaaf3c2736e3934a191265a18 Mon Sep 17 00:00:00 2001 From: varunnaganathan Date: Thu, 24 Dec 2015 21:12:49 +0530 Subject: [1.9.x] Fixed #25316 -- Fixed a crash with order_by() and values() after annotate(). Backport of 3eba9638ee69138c73efb1d1c1d1b806ddafc6cf from master --- docs/releases/1.8.8.txt | 4 ++++ docs/releases/1.9.1.txt | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'docs') diff --git a/docs/releases/1.8.8.txt b/docs/releases/1.8.8.txt index a888925841..2a8dc5792d 100644 --- a/docs/releases/1.8.8.txt +++ b/docs/releases/1.8.8.txt @@ -54,3 +54,7 @@ Bugfixes * Made ``loaddata`` skip disabling and enabling database constraints when it doesn't load any fixtures (:ticket:`23372`). + +* Fixed a crash in ``QuerySet.values()/values_list()`` after an ``annotate()`` + and ``order_by()`` when ``values()/values_list()`` includes a field not in + the ``order_by()`` (:ticket:`25316`). diff --git a/docs/releases/1.9.1.txt b/docs/releases/1.9.1.txt index 46e4f25807..b8980e0dd2 100644 --- a/docs/releases/1.9.1.txt +++ b/docs/releases/1.9.1.txt @@ -79,3 +79,7 @@ Bugfixes * Restored ``contrib.auth`` hashers compatibility with py-bcrypt (:ticket:`26016`). + +* Fixed a crash in ``QuerySet.values()/values_list()`` after an ``annotate()`` + and ``order_by()`` when ``values()/values_list()`` includes a field not in + the ``order_by()`` (:ticket:`25316`). -- cgit v1.3