Browse Source

Unlogged->LoggedOut

release-2.9
chirac 5 years ago
committed by Gabriel Detraz
parent
commit
9669ab6851
  1. 4
      re2o/views.py
  2. 4
      topologie/views_autocomplete.py
  3. 4
      users/views_autocomplete.py

4
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

4
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

4
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

Loading…
Cancel
Save