From 5d820c6ed29a744519316e0d1096dde42d56e768 Mon Sep 17 00:00:00 2001 From: Kálmán Viktor Date: Wed, 30 Apr 2014 12:09:34 +0200 Subject: [PATCH] dashboard: fix mentioned problems in sort - node's default ordering is fine - replacing "-" does not always work so fixed for example: ?sort=-na-me --- circle/dashboard/views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py index d333d62..23d87cd 100644 --- a/circle/dashboard/views.py +++ b/circle/dashboard/views.py @@ -995,11 +995,9 @@ class VmList(LoginRequiredMixin, ListView): # remove "-" that means descending order # also check if the column name is valid if (sort and - sort.replace("-", "") + (sort[1:] if sort[0] == "-" else sort) in [i.name for i in Instance._meta.fields] + ["pk"]): - queryset = queryset.order_by( - # we order nodes by the normalized_name - sort.replace("node", "node__normalized_name")) + queryset = queryset.order_by(sort) return queryset.select_related('owner', 'node') -- libgit2 0.26.0