From f6f32d46598e1fc29a54b119b3a33263d22b35c9 Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@.uni.lu>
Date: Thu, 27 Sep 2018 16:17:15 +0200
Subject: [PATCH] changed order of operations: first filter, then sort and
finally slice
---
smash/web/api_views/subject.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/smash/web/api_views/subject.py b/smash/web/api_views/subject.py
index f5eed511..0d089e23 100644
--- a/smash/web/api_views/subject.py
+++ b/smash/web/api_views/subject.py
@@ -283,9 +283,9 @@ def subjects(request, type):
count = all_subjects.count()
- ordered_subjects = get_subjects_order(all_subjects, order_column, order_dir)
- filtered_subjects = get_subjects_filtered(ordered_subjects, filters)
- sliced_subjects = filtered_subjects[start:(start + length)]
+ filtered_subjects = get_subjects_filtered(all_subjects, filters)
+ ordered_subjects = get_subjects_order(filtered_subjects, order_column, order_dir)
+ sliced_subjects = ordered_subjects[start:(start + length)]
result_subjects = sliced_subjects
--
GitLab