Merge branch 'dev' of github.com:hmarr/mongoengine into dev

2010-11-02 13:44:19 +00:00
parent 11950eabea 6b880aa8b3
commit c6058fafed
2 changed files with 21 additions and 1 deletions
--- a/mongoengine/queryset.py
+++ b/mongoengine/queryset.py
@@ -431,7 +431,9 @@ class QuerySet(object):
                self._cursor_obj.where(self._where_clause)

            # apply default ordering
-            if self._document._meta['ordering']:
+            if self._ordering:
+                self._cursor_obj.sort(self._ordering)
+            elif self._document._meta['ordering']:
                self.order_by(*self._document._meta['ordering'])

            if self._limit is not None: