diff --git a/re2o/views.py b/re2o/views.py index f5c6e476..bf08009a 100644 --- a/re2o/views.py +++ b/re2o/views.py @@ -173,7 +173,7 @@ def handler404(request): return render(request, "errors/404.html", status=404) -class AutocompleteUnloggedViewMixin(autocomplete.Select2QuerySetView): +class AutocompleteLoggedOutViewMixin(autocomplete.Select2QuerySetView): obj_type = None # This MUST be overridden by child class query_set = None query_filter = "name__icontains" # Override this if necessary @@ -195,6 +195,6 @@ class AutocompleteUnloggedViewMixin(autocomplete.Select2QuerySetView): return self.query_set -class AutocompleteViewMixin(LoginRequiredMixin, AutocompleteUnloggedViewMixin): +class AutocompleteViewMixin(LoginRequiredMixin, AutocompleteLoggedOutViewMixin): pass diff --git a/topologie/views_autocomplete.py b/topologie/views_autocomplete.py index 5972da6d..3eb58db4 100644 --- a/topologie/views_autocomplete.py +++ b/topologie/views_autocomplete.py @@ -36,10 +36,10 @@ from django.db.models.functions import Concat from .models import Room, Dormitory, Building, Switch, PortProfile, Port, SwitchBay -from re2o.views import AutocompleteViewMixin, AutocompleteUnloggedViewMixin +from re2o.views import AutocompleteViewMixin, AutocompleteLoggedOutViewMixin -class RoomAutocomplete(AutocompleteUnloggedViewMixin): +class RoomAutocomplete(AutocompleteLoggedOutViewMixin): obj_type = Room # Precision on search to add annotations so search behaves more like users expect it to diff --git a/users/views_autocomplete.py b/users/views_autocomplete.py index 219fe2bb..014dd146 100644 --- a/users/views_autocomplete.py +++ b/users/views_autocomplete.py @@ -33,13 +33,13 @@ from __future__ import unicode_literals from .models import User, School, Adherent, Club, ListShell -from re2o.views import AutocompleteViewMixin, AutocompleteUnloggedViewMixin +from re2o.views import AutocompleteViewMixin, AutocompleteLoggedOutViewMixin from django.db.models import Q, Value, CharField from django.db.models.functions import Concat -class SchoolAutocomplete(AutocompleteUnloggedViewMixin): +class SchoolAutocomplete(AutocompleteLoggedOutViewMixin): obj_type = School