X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Futils.py;h=9ed9e41e35f60affafe0e791ed01d978a6c271ad;hb=f0ad2c6a249c0ee3a4b356e10033ea0041ecbea4;hp=7e3346ef1f986518772599be4086a8370bab2f8e;hpb=628a57c214b63b81e457a4a369cc370f4254358f;p=patchwork diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py index 7e3346e..9ed9e41 100644 --- a/apps/patchwork/utils.py +++ b/apps/patchwork/utils.py @@ -99,7 +99,7 @@ class Order(object): if self.reversed: q = '-' + q - qs = qs.order_by(q) + orders = [q] # if we're using a non-default order, add the default as a secondary # ordering. We reverse the default if the primary is reversed. @@ -108,9 +108,9 @@ class Order(object): q = self.order_map[default_name] if self.reversed ^ default_reverse: q = '-' + q - qs = qs.order_by(q) + orders.append(q) - return qs + return qs.order_by(*orders) bundle_actions = ['create', 'add', 'remove'] def set_bundle(user, project, action, data, patches, context):