ynerant/med
1
0
Fork 0
mirror of https://gitlab.crans.org/mediatek/med.git synced 2025-08-24 14:52:55 +02:00
Code Issues Releases Wiki Activity

Swap AbstractBaseUser to AbstractUser

Browse Source
This commit is contained in:
Alexandre Iooss
2019-08-08 12:16:40 +02:00
parent 0b42060c51
commit 781b2087a3
18 changed files with 242 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
search/views.py
View File

@@ -40,15 +40,15 @@ def search_result(search, type, request):
recherche = {'users_list': None, 'emprunts_list': None, 'medias_list': None, 'jeux_list': None}
if request.user.has_perms(('perm',)):
query = Q(user__username__icontains=search) | Q(user__name__icontains=search) | Q(
query = Q(user__username__icontains=search) | Q(user__first_name__icontains=search) | Q(
user__last_name__icontains=search)
else:
query = (Q(user__username__icontains=search) | Q(user__name__icontains=search) | Q(
query = (Q(user__username__icontains=search) | Q(user__first_name__icontains=search) | Q(
user__last_name__icontains=search)) & Q(user=request.user)
for i in aff:
if i == '0':
query_user_list = Q(username__icontains=search) | Q(name__icontains=search) | Q(
query_user_list = Q(username__icontains=search) | Q(first_name__icontains=search) | Q(
last_name__icontains=search) & query1
if request.user.has_perms(('perm',)):
recherche['users_list'] = User.objects.filter(query_user_list).order_by('last_name')
@@ -63,7 +63,7 @@ def search_result(search, type, request):
if i == '3':
recherche['jeux_list'] = Jeu.objects.filter(
Q(nom__icontains=search) | Q(proprietaire__username__icontains=search) | Q(
proprietaire__name__icontains=search) | Q(proprietaire__last_name__icontains=search))
proprietaire__first_name__icontains=search) | Q(proprietaire__last_name__icontains=search))
for r in recherche:
if recherche[r] is not None: