From c69e4bc69166b2d752b437a651dfa91f8b53ecfd Mon Sep 17 00:00:00 2001 From: Дилян Палаузов Date: Mon, 6 Nov 2017 10:23:29 -0500 Subject: Fixed #28769 -- Replaced 'x if x else y' with 'x or y'. --- django/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 372431c620..57da2fe68b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -606,7 +606,7 @@ class Query: # Ordering uses the 'rhs' ordering, unless it has none, in which case # the current ordering is used. - self.order_by = rhs.order_by if rhs.order_by else self.order_by + self.order_by = rhs.order_by or self.order_by self.extra_order_by = rhs.extra_order_by or self.extra_order_by def deferred_to_data(self, target, callback): -- cgit v1.3