From c6c0a1526bdcf9b5b8a9282ddfbb2e9d9e8f4aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Cl=C3=A9rice?= <leponteineptique@gmail.com>
Date: Tue, 17 Sep 2024 09:42:25 +0200
Subject: [PATCH] Change the way the control list filter view is shown

---
 app/control_lists/views.py                    | 28 +++++++++++--------
 .../control_lists/ignore_filter.html          | 12 ++++----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/control_lists/views.py b/app/control_lists/views.py
index 4e9d4b0..bcd6fcc 100644
--- a/app/control_lists/views.py
+++ b/app/control_lists/views.py
@@ -380,8 +380,6 @@ def information_read(control_list_id):
 @login_required
 @cl_editable("control_list_id")
 def ignore_terms_filter(control_list_id, control_list):
-    current_controlList = ControlLists.query.filter_by(**{"id":control_list.id}).first_or_404()
-    print(current_controlList.filter_punct, current_controlList.filter_ignore)
     list_filter = []
     if request.method == "POST":
         list_filter.append(request.form.get("punct"))
@@ -393,18 +391,24 @@ def ignore_terms_filter(control_list_id, control_list):
             if el is not None:
                 filtered_filter.append(el)
 
-        current_controlList.filter_punct = 'punct' in filtered_filter
-        current_controlList.filter_metadata = 'metadata' in filtered_filter
-        current_controlList.filter_numeral = 'numeral' in filtered_filter
-        current_controlList.filter_ignore = 'ignore' in filtered_filter
-        db.session.add(current_controlList)
+        control_list.filter_punct = 'punct' in filtered_filter
+        control_list.filter_metadata = 'metadata' in filtered_filter
+        control_list.filter_numeral = 'numeral' in filtered_filter
+        control_list.filter_ignore = 'ignore' in filtered_filter
+        db.session.add(control_list)
         db.session.commit()
 
 
         flash('The filters have been updated.', 'success')
-        current_controlList = ControlLists.query.filter_by(**{"id":control_list_id}).first_or_404()
-        print(current_controlList.filter_punct, current_controlList.filter_ignore)
-        return render_template_with_nav_info('control_lists/ignore_filter.html', control_list_id=control_list_id,
-                                             current_control_list=current_controlList)
+        db.session.refresh(control_list)
+        return render_template_with_nav_info(
+            'control_lists/ignore_filter.html',
+            control_list_id=control_list_id,
+            control_list=control_list
+        )
 
-    return render_template_with_nav_info('control_lists/ignore_filter.html', control_list_id=control_list_id, current_control_list=current_controlList)
\ No newline at end of file
+    return render_template_with_nav_info(
+        'control_lists/ignore_filter.html',
+        control_list_id=control_list_id,
+        control_list=control_list
+    )
\ No newline at end of file
diff --git a/app/templates/control_lists/ignore_filter.html b/app/templates/control_lists/ignore_filter.html
index 6928a68..f68084c 100644
--- a/app/templates/control_lists/ignore_filter.html
+++ b/app/templates/control_lists/ignore_filter.html
@@ -1,35 +1,35 @@
 {% extends 'layouts/base.html' %}
 {% import 'macros/nav_macros.html' as nav %}
 
-{% block page_title %}Control List {{current_control_list.name}}{% endblock %}
+{% block page_title %}Control List {{control_list.name}}{% endblock %}
 
 {% block content %}
-<h1>{{current_control_list.name}}</h1>
+<h1>{{control_list.name}}</h1>
 <h2>{{ _('Change the filters for Control List') }}</h2>
         <div class="row ">
             <form method="POST">
         <ul>
                 <li>
                     <label>
-                        <input type="checkbox" name="punct" value="punct" {% if current_control_list.filter_punct %}checked{% endif %}>
+                        <input type="checkbox" name="punct" value="punct" {% if control_list.filter_punct %}checked{% endif %}>
                         Punctuation
                     </label>
                 </li>
             <li>
                     <label>
-                        <input type="checkbox" name="numeral" value="numeral" {% if current_control_list.filter_numeral %}checked{% endif %}>
+                        <input type="checkbox" name="numeral" value="numeral" {% if control_list.filter_numeral %}checked{% endif %}>
                         Numeral
                     </label>
                 </li>
             <li>
                     <label>
-                        <input type="checkbox" name="metadata" value="metadata" {% if current_control_list.filter_metadata %}checked{% endif %}>
+                        <input type="checkbox" name="metadata" value="metadata" {% if control_list.filter_metadata %}checked{% endif %}>
                         Metadata
                     </label>
                 </li>
             <li>
                     <label>
-                        <input type="checkbox" name="ignore" value="ignore" {% if current_control_list.filter_ignore %}checked{% endif %}>
+                        <input type="checkbox" name="ignore" value="ignore" {% if control_list.filter_ignore %}checked{% endif %}>
                         Ignore
                     </label>
                 </li>