pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'elasticsales/clear-default-ordering'

Browse Source
This commit is contained in:
Jonathan Prates
2014-06-12 10:28:36 -03:00
parent 85187239b6 1eacc6fbff
commit 2312e17a8e
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mongoengine/queryset/base.py
View File

@@ -50,7 +50,7 @@ class BaseQuerySet(object):
self._initial_query = {}
self._where_clause = None
self._loaded_fields = QueryFieldList()
self._ordering = []
self._ordering = None
self._snapshot = False
self._timeout = True
self._class_check = True
@@ -1206,8 +1206,9 @@ class BaseQuerySet(object):
if self._ordering:
# Apply query ordering
self._cursor_obj.sort(self._ordering)
elif self._document._meta['ordering']:
# Otherwise, apply the ordering from the document model
elif self._ordering is None and self._document._meta['ordering']:
# Otherwise, apply the ordering from the document model, unless
# it's been explicitly cleared via order_by with no arguments
order = self._get_order_by(self._document._meta['ordering'])
self._cursor_obj.sort(order)