From 9b3635723e98edf0b286686b6b01095fcf556c76 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Sun, 20 Mar 2022 15:21:42 +0300
Subject: [PATCH] new filter

---
 Main/views/SolutionsTableView.py | 8 ++++----
 templates/solutions.html         | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Main/views/SolutionsTableView.py b/Main/views/SolutionsTableView.py
index 147dc07..90b3a73 100644
--- a/Main/views/SolutionsTableView.py
+++ b/Main/views/SolutionsTableView.py
@@ -18,6 +18,9 @@ class SolutionsTableView(BaseView):
         if 'page' not in self.request.GET:
             raise AccessError()
         self.page = int(self.request.GET['page'])
+        if self.setTask is not None:
+            self.set = self.setTask.set
+            self.task = self.setTask.task
 
     def get(self):
         queryset = Solution.objects.all()
@@ -33,10 +36,7 @@ class SolutionsTableView(BaseView):
             else:
                 raise AccessError()
         else:
-            if self.set:
-                queryset = queryset.filter(user=self.request.user, task=self.setTask.task, set=self.setTask.set)
-            else:
-                queryset = queryset.filter(user=self.request.user, task=self.task, set=None)
+            queryset = queryset.filter(user=self.request.user, task=self.task, set=self.set)
         offset = self.page_size * (self.page - 1)
         limit = self.page_size
         self.context["solutions"] = queryset.order_by("-id")[offset:offset + limit]
diff --git a/templates/solutions.html b/templates/solutions.html
index 362c3a3..560de2a 100644
--- a/templates/solutions.html
+++ b/templates/solutions.html
@@ -24,8 +24,7 @@
 
 {% block main %}
     <h2>Решения <a href="{% if in_set %}/set?set_id={{ set.id }}{% else %}/task?task_id={{ task.id }}{% endif %}">{% if in_set %}{{ set.name }}{% else %}{{ task.name }}{% endif %}</a></h2>
-    <!--
-    <h4>Фильтр (пока недоступная опция)</h4>
+    <h4>Фильтр</h4>
     <div>
         <select name="set_id" style="width: 33%">
             <option value="0">Все сеты</option>
@@ -46,6 +45,5 @@
             {% endfor %}
         </select>
     </div>
-    -->
     <div id="solutions"></div>
 {% endblock %}
\ No newline at end of file