p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: Fixed bug in combining ordered QuerySets 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-02-07 00:51:42 +00:00
parent e28addd70b
commit ab6a97cb4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/query.py
View File

@ -288,7 +288,7 @@ class QuerySet(object):
combined = other._clone() combined = other._clone()
# If 'self' is ordered and 'other' isn't, propagate 'self's ordering # If 'self' is ordered and 'other' isn't, propagate 'self's ordering
if (self._order_by is not None and len(self._order_by) > 0) and \ if (self._order_by is not None and len(self._order_by) > 0) and \
(combined._order_by is None or len(combined._order_by == 0)): (combined._order_by is None or len(combined._order_by) == 0):
combined._order_by = self._order_by combined._order_by = self._order_by
return combined return combined