coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-12-23 23:43:47 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-3.3.1' into 'dev'

Browse source 
Fix 3.3.1

See merge request coope/coopev3!10
This commit is contained in:
Nanoy 2019-01-23 12:33:01 +01:00
commit cb3c9a80d1
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,3 +1,5 @@
## v3.3.1
* contains devient icontains pour enlever la sensibilité à la casse
## v3.3.0
* Ajout d'icônes
* Le . est utilisé pour les décimaux

10
gestion/views.py
View file

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

2
templates/footer.html
View file

@ -39,6 +39,6 @@
<li><a href="https://www.facebook.com/coopesmetz/" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
</ul>
</section>
<p class="copyright">coope.rez v3.3.0 (release stable) &copy; 2018 Yoann Pietri.</p>
<p class="copyright">coope.rez v3.3.1 (release stable) &copy; 2018 Yoann Pietri.</p>

10
users/views.py
View file

@ -1079,7 +1079,7 @@ class AllUsersAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
qs = User.objects.all()
if self.q:
qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
qs = qs.filter(Q(username__icontains=self.q) | Q(first_name__icontains=self.q) | Q(last_name__icontains=self.q))
return qs
class ActiveUsersAutocomplete(autocomplete.Select2QuerySetView):
@ -1089,7 +1089,7 @@ class ActiveUsersAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
qs = User.objects.filter(is_active=True)
if self.q:
qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
qs = qs.filter(Q(username__icontains=self.q) | Q(first_name__icontains=self.q) | Q(last_name__icontains=self.q))
return qs
class AdherentAutocomplete(autocomplete.Select2QuerySetView):
@ -1101,7 +1101,7 @@ class AdherentAutocomplete(autocomplete.Select2QuerySetView):
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))
qs = qs.filter(Q(username__icontains=self.q) | Q(first_name__icontains=self.q) | Q(last_name__icontains=self.q))
return qs
@ -1112,7 +1112,7 @@ class NonSuperUserAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
qs = User.objects.filter(is_superuser=False)
if self.q:
qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
qs = qs.filter(Q(username__icontains=self.q) | Q(first_name__icontains=self.q) | Q(last_name__icontains=self.q))
return qs
class NonAdminUserAutocomplete(autocomplete.Select2QuerySetView):
@ -1122,5 +1122,5 @@ class NonAdminUserAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
qs = User.objects.filter(is_staff=False)
if self.q:
qs = qs.filter(Q(username__contains=self.q) | Q(first_name__contains=self.q) | Q(last_name__contains=self.q))
qs = qs.filter(Q(username__icontains=self.q) | Q(first_name__icontains=self.q) | Q(last_name__icontains=self.q))
return qs