coopeTM
/
coope
mirror of https://github.com/nanoy42/coope
3
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'search' into dev

pull/4/head
Yoann Piétri 7 years ago
parent
d99d5a9ae3 dac7a8312b
commit
dcabaaf4c0
2 changed files with 14 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      gestion/views.py
  2. 13
      users/views.py

10
gestion/views.py
View File

@ -532,7 +532,7 @@ class ProductsAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = Product.objects.all() qs = Product.objects.all()
if self.q: if self.q:
qs = qs.filter(name__istartswith=self.q) qs = qs.filter(name__contains=self.q)
return qs return qs
class ActiveProductsAutocomplete(autocomplete.Select2QuerySetView): class ActiveProductsAutocomplete(autocomplete.Select2QuerySetView):
@ -542,7 +542,7 @@ class ActiveProductsAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = Product.objects.filter(is_active=True) qs = Product.objects.filter(is_active=True)
if self.q: if self.q:
qs = qs.filter(name__istartswith=self.q) qs = qs.filter(name__contains=self.q)
return qs return qs
########## Kegs ########## ########## Kegs ##########
@ -790,7 +790,7 @@ class KegActiveAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = Keg.objects.filter(is_active = True) qs = Keg.objects.filter(is_active = True)
if self.q: if self.q:
qs = qs.filter(name__istartswith=self.q) qs = qs.filter(name__contains=self.q)
return qs return qs
class KegPositiveAutocomplete(autocomplete.Select2QuerySetView): class KegPositiveAutocomplete(autocomplete.Select2QuerySetView):
@ -800,7 +800,7 @@ class KegPositiveAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = Keg.objects.filter(stockHold__gt = 0) qs = Keg.objects.filter(stockHold__gt = 0)
if self.q: if self.q:
qs = qs.filter(name__istartswith=self.q) qs = qs.filter(name__contains=self.q)
return qs return qs
########## Menus ########## ########## Menus ##########
@ -957,7 +957,7 @@ class MenusAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = Menu.objects.all() qs = Menu.objects.all()
if self.q: if self.q:
qs = qs.filter(name__istartswith=self.q) qs = qs.filter(name__contains=self.q)
return qs return qs
########## Ranking ########## ########## Ranking ##########

13
users/views.py
View File

@ -1079,7 +1079,7 @@ class AllUsersAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = User.objects.all() qs = User.objects.all()
if self.q: if self.q:
qs = qs.filter(Q(username__istartswith=self.q) | Q(first_name__istartswith=self.q) | Q(last_name__istartswith=self.q)) qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
return qs return qs
class ActiveUsersAutocomplete(autocomplete.Select2QuerySetView): class ActiveUsersAutocomplete(autocomplete.Select2QuerySetView):
@ -1089,7 +1089,7 @@ class ActiveUsersAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = User.objects.filter(is_active=True) qs = User.objects.filter(is_active=True)
if self.q: if self.q:
qs = qs.filter(Q(username__istartswith=self.q) | Q(first_name__istartswith=self.q) | Q(last_name__istartswith=self.q)) qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
return qs return qs
class AdherentAutocomplete(autocomplete.Select2QuerySetView): class AdherentAutocomplete(autocomplete.Select2QuerySetView):
@ -1098,8 +1098,13 @@ class AdherentAutocomplete(autocomplete.Select2QuerySetView):
""" """
def get_queryset(self): def get_queryset(self):
qs = User.objects.all() qs = User.objects.all()
pks = [x.pk for x in qs if x.is_adherent]
qs = User.objects.filter(pk__in=pks)
if self.q:
qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
return qs return qs
class NonSuperUserAutocomplete(autocomplete.Select2QuerySetView): class NonSuperUserAutocomplete(autocomplete.Select2QuerySetView):
""" """
Autocomplete for non-superuser users Autocomplete for non-superuser users
@ -1107,7 +1112,7 @@ class NonSuperUserAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = User.objects.filter(is_superuser=False) qs = User.objects.filter(is_superuser=False)
if self.q: if self.q:
qs = qs.filter(Q(username__istartswith=self.q) | Q(first_name__istartswith=self.q) | Q(last_name__istartswith=self.q)) qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
return qs return qs
class NonAdminUserAutocomplete(autocomplete.Select2QuerySetView): class NonAdminUserAutocomplete(autocomplete.Select2QuerySetView):
@ -1117,5 +1122,5 @@ class NonAdminUserAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
qs = User.objects.filter(is_staff=False) qs = User.objects.filter(is_staff=False)
if self.q: if self.q:
qs = qs.filter(Q(username__istartswith=self.q) | Q(first_name__istartswith=self.q) | Q(last_name__istartswith=self.q)) qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
return qs return qs
Write Preview
Loading…
Cancel
Save