Buttons list didn't work as well

apps/note/tables.py

@@ -131,12 +131,10 @@ class ButtonTable(tables.Table):
         row_attrs = {
             'class': lambda record: 'table-row ' + ('table-success' if record.display else 'table-danger'),
             'id': lambda record: "row-" + str(record.pk),
-            'data-href': lambda record: record.pk
         }
 
         model = TransactionTemplate
         exclude = ('id',)
-        order_by = ('type', '-display', 'destination__name', 'name',)
 
     edit = tables.LinkColumn('note:template_update',
                              args=[A('pk')],

apps/note/views.py

@@ -5,6 +5,7 @@ import json
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, UpdateView
 from django_tables2 import SingleTableView
@@ -72,6 +73,19 @@ class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, Sing
     model = TransactionTemplate
     table_class = ButtonTable
 
+    def get_queryset(self, **kwargs):
+        """
+        Filter the user list with the given pattern.
+        """
+        qs = super().get_queryset().distinct()
+        if "search" in self.request.GET:
+            pattern = self.request.GET["search"]
+            qs = qs.filter(Q(name__iregex="^" + pattern) | Q(destination__club__name__iregex="^" + pattern))
+
+        qs = qs.order_by('-display', 'category__name', 'destination__club__name', 'name')
+
+        return qs
+
 
 class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """

locale/de/LC_MESSAGES/django.po

@@ -1784,10 +1784,6 @@ msgstr ""
 msgid "Name of the button..."
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:16
-msgid "Display visible buttons only"
-msgstr ""
-
 #: templates/note/transactiontemplate_list.html:21
 msgid "New button"
 msgstr ""

locale/fr/LC_MESSAGES/django.po

@@ -1846,10 +1846,6 @@ msgstr "Chercher un bouton"
 msgid "Name of the button..."
 msgstr "Nom du bouton ..."
 
-#: templates/note/transactiontemplate_list.html:16
-msgid "Display visible buttons only"
-msgstr "N'afficher que les boutons visibles uniquement"
-
 #: templates/note/transactiontemplate_list.html:21
 msgid "New button"
 msgstr "Nouveau bouton"

static/js/alias.js

@@ -13,7 +13,7 @@
                 "note": note_id
             }
      ).done(function(){
-         $("#alias_table").load(location.href+ " #alias_table");
+         $("#alias_table").load(location.pathname+ " #alias_table");
          addMsg("Alias ajouté","success");
      })
       .fail(function(xhr, textStatus, error){
@@ -29,7 +29,7 @@
      })
       .done(function(){
           addMsg('Alias supprimé','success');
-          $("#alias_table").load(location.href + " #alias_table");
+          $("#alias_table").load(location.pathname + " #alias_table");
       })
       .fail(function(xhr,textStatus, error){
           errMsg(xhr.responseJSON);

templates/activity/activity_detail.html

@@ -92,7 +92,7 @@
      })
       .done(function() {
           addMsg('Invité supprimé','success');
-          $("#guests_table").load(location.href + " #guests_table");
+          $("#guests_table").load(location.pathname + " #guests_table");
       })
       .fail(function(xhr, textStatus, error) {
           errMsg(xhr.responseJSON);

templates/activity/activity_entry.html

@@ -51,7 +51,7 @@
             if ((pattern === old_pattern || pattern === "") && !force)
                 return;
 
-            $("#entry_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #entry_table", init);
+            $("#entry_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #entry_table", init);
             refreshBalance();
         }
 

templates/member/club_list.html

@@ -36,7 +36,7 @@
 
         function reloadTable() {
             let pattern = searchbar_obj.val();
-            $("#club_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #club_table", init);
+            $("#club_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #club_table", init);
         }
 
         searchbar_obj.keyup(function() {

templates/member/user_list.html

@@ -34,7 +34,7 @@
             if (pattern === old_pattern || pattern === "")
                 return;
 
-            $("#user_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
+            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
         }
 
         searchbar_obj.keyup(function() {

templates/note/transactiontemplate_list.html

@@ -9,14 +9,6 @@
             {% trans "Search button" %}
         </h4>
         <input class="form-control mx-auto w-25" type="text" id="search_field" placeholder="{% trans "Name of the button..." %}">
-        <div class="form-group">
-            <div id="div_active_only" class="form-check">
-                <label for="active_only" class="form-check-label">
-                    <input type="checkbox" name="active_only" class="checkboxinput form-check-input" checked="" id="active_only">
-                    {% trans "Display visible buttons only" %}
-                </label>
-            </div>
-        </div>
         <hr>
         <a class="btn btn-primary text-center my-1" href="{% url 'note:template_create' %}">{% trans "New button" %}</a>
     </div>
@@ -36,66 +28,39 @@
 {% endblock %}
 
 {% block extrajavascript %}
-<script>
-    /* fonction appelée à la fin du timer */
-    function getInfo() {
-        var asked = $("#search_field").val();
-        /* on ne fait la requête que si on a au moins un caractère pour chercher */
-        if (asked.length >= 1) {
-            $.getJSON("/api/note/transaction/template/?format=json&search=" + asked + ($("#active_only").is(":checked") ? "&display=true" : ""), function(buttons) {
-                console.log(buttons);
-                let selected_id = buttons.results.map((a => "#row-" + a.id));
-                console.log(".table-row " + selected_id.join());
-                $(".table-row " + selected_id.join()).removeClass('d-none');
-                $(".table-row").not(selected_id.join()).addClass('d-none');
-            });
-        }
-        else {
-            if ($("#active_only").is(":checked")) {
-                $('.table-success').removeClass('d-none');
-                $('.table-danger').addClass('d-none');
-            }
-            else {
-                // show everything
-                $('table tr').removeClass('d-none');
-            }
-        }
-    }
+<script type="text/javascript">
+    $(document).ready(function() {
+        let searchbar_obj = $("#search_field");
+        var timer_on = false;
+        var timer;
 
-    var timer;
-    var timer_on;
-    /* Fontion appelée quand le texte change (délenche le timer) */
-    function search_field_moved() {
-        if (timer_on) { // Si le timer a déjà été lancé, on réinitialise le compteur.
-            clearTimeout(timer);
-            timer = setTimeout(getInfo, 300);
+        function reloadTable() {
+            let pattern = searchbar_obj.val();
+            $("#buttons_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #buttons_table");
         }
-        else { // Sinon, on le lance et on enregistre le fait qu'il tourne.
-            timer = setTimeout(getInfo, 300);
+
+        searchbar_obj.keyup(function() {
+            if (timer_on)
+                clearTimeout(timer);
             timer_on = true;
-        }
-    }
+            setTimeout(reloadTable, 0);
+        });
+    });
+
     // on click of button "delete" , call the API
      function delete_button(button_id) {
          $.ajax({
-             url:"/api/note/transaction/template/"+button_id+"/",
+             url:"/api/note/transaction/template/" + button_id + "/",
              method:"DELETE",
              headers: {"X-CSRFTOKEN": CSRF_TOKEN}
          })
-          .done(function(){
+          .done(function() {
               addMsg('{% trans "button successfully deleted "%}','success');
-              $("#buttons_table").load("{% url 'note:template_list' %} #buttons_table");
+            $("#buttons_table").load(location.pathname + "?search=" + $("#search_field").val().replace(" ", "%20") + " #buttons_table");
           })
-          .fail(function(){
-              addMsg(' {% trans "Unable to delete button "%} #' + button_id,'danger' )
+          .fail(function() {
+              addMsg('{% trans "Unable to delete button "%} #' + button_id, 'danger')
           });
      }
-
-     $(document).ready(function() {
-         $("#search_field").keyup(search_field_moved);
-         $("#active_only").change(search_field_moved);
-
-         search_field_moved();
-     });
 </script>
 {% endblock %}

templates/registration/future_user_list.html

@@ -32,7 +32,7 @@
             if (pattern === old_pattern || pattern === "")
                 return;
 
-            $("#user_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
+            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
 
             $(".table-row").click(function() {
                 window.document.location = $(this).data("href");