Custom auto-complete fields, remove DAL requirement

apps/note/api/views.py

@@ -24,7 +24,8 @@ class NotePolymorphicViewSet(ReadOnlyProtectedModelViewSet):
     """
     queryset = Note.objects.all()
     serializer_class = NotePolymorphicSerializer
-    filter_backends = [SearchFilter, OrderingFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
+    filterset_fields = ['polymorphic_ctype', 'is_active', ]
     search_fields = ['$alias__normalized_name', '$alias__name', '$polymorphic_ctype__model', ]
     ordering_fields = ['alias__name', 'alias__normalized_name']
 

apps/note/forms.py

@@ -1,11 +1,12 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from dal import autocomplete
 from django import forms
+from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext_lazy as _
+from note_kfet.inputs import AutocompleteModelSelect
 
-from .models import TransactionTemplate
+from .models import TransactionTemplate, NoteClub
 
 
 class ImageForm(forms.Form):
@@ -30,11 +31,12 @@ class TransactionTemplateForm(forms.ModelForm):
         # forward=(forward.Const('TYPE', 'note_type') où TYPE est dans {user, club, special}
         widgets = {
             'destination':
-                autocomplete.ModelSelect2(
-                    url='note:note_autocomplete',
+                AutocompleteModelSelect(
+                    NoteClub,
                     attrs={
-                        'data-placeholder': 'Note ...',
-                        'data-minimum-input-length': 1,
+                        'api_url': '/api/note/note/',
+                        'api_url_suffix': '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk),
+                        'placeholder': 'Note ...',
                     },
                 ),
         }

apps/note/urls.py

@@ -13,7 +13,4 @@ urlpatterns = [
     path('buttons/update/<int:pk>/', views.TransactionTemplateUpdateView.as_view(), name='template_update'),
     path('buttons/', views.TransactionTemplateListView.as_view(), name='template_list'),
     path('consos/', views.ConsoView.as_view(), name='consos'),
-
-    # API for the note autocompleter
-    path('note-autocomplete/', views.NoteAutocomplete.as_view(model=Note), name='note_autocomplete'),
 ]

apps/note/views.py

@@ -1,10 +1,8 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from dal import autocomplete
 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
@@ -13,7 +11,7 @@ from note_kfet.inputs import AmountInput
 from permission.backends import PermissionBackend
 
 from .forms import TransactionTemplateForm
-from .models import Transaction, TransactionTemplate, Alias, RecurrentTransaction, NoteSpecial
+from .models import Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial
 from .models.transactions import SpecialTransaction
 from .tables import HistoryTable, ButtonTable
 
@@ -49,62 +47,6 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView):
         return context
 
 
-class NoteAutocomplete(autocomplete.Select2QuerySetView):
-    """
-    Auto complete note by aliases. Used in every search field for note
-    ex: :view:`ConsoView`, :view:`TransactionCreateView`
-    """
-
-    def get_queryset(self):
-        """
-        When someone look for an :models:`note.Alias`, a query is sent to the dedicated API.
-        This function handles the result and return a filtered list of aliases.
-        """
-        #  Un utilisateur non connecté n'a accès à aucune information
-        if not self.request.user.is_authenticated:
-            return Alias.objects.none()
-
-        qs = Alias.objects.all()
-
-        # self.q est le paramètre de la recherche
-        if self.q:
-            qs = qs.filter(Q(name__regex="^" + self.q) | Q(normalized_name__regex="^" + Alias.normalize(self.q))) \
-                .order_by('normalized_name').distinct()
-
-        # Filtrage par type de note (user, club, special)
-        note_type = self.forwarded.get("note_type", None)
-        if note_type:
-            types = str(note_type).lower()
-            if "user" in types:
-                qs = qs.filter(note__polymorphic_ctype__model="noteuser")
-            elif "club" in types:
-                qs = qs.filter(note__polymorphic_ctype__model="noteclub")
-            elif "special" in types:
-                qs = qs.filter(note__polymorphic_ctype__model="notespecial")
-            else:
-                qs = qs.none()
-
-        return qs
-
-    def get_result_label(self, result):
-        """
-        Show the selected alias and the username associated
-        <Alias> (aka. <Username> )
-        """
-        # Gère l'affichage de l'alias dans la recherche
-        res = result.name
-        note_name = str(result.note)
-        if res != note_name:
-            res += " (aka. " + note_name + ")"
-        return res
-
-    def get_result_value(self, result):
-        """
-        The value used for the transactions will be the id of the Note.
-        """
-        return str(result.note.pk)
-
-
 class TransactionTemplateCreateView(LoginRequiredMixin, CreateView):
     """
     Create TransactionTemplate