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

Rename pseudo to username

Browse Source
This commit is contained in:
Alexandre Iooss
2019-08-02 21:35:30 +02:00
parent afdb08b926
commit e82053d16f
11 changed files with 91 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
search/views.py
View File

@@ -22,44 +22,39 @@ def form(ctx, template, request):
def search_result(search, type, request):
date_deb = None
date_fin = None
states = []
aff = []
if (type):
if type:
aff = search.cleaned_data['affichage']
states = search.cleaned_data['filtre']
date_deb = search.cleaned_data['date_deb']
date_fin = search.cleaned_data['date_fin']
date_query = Q()
if aff == []:
if not aff:
aff = ['0', '1', '2', '3']
if date_deb != None:
if date_deb is not None:
date_query = date_query & Q(date_emprunt__gte=date_deb)
if date_fin != None:
if date_fin is not None:
date_query = date_query & Q(date_emprunt__lte=date_fin)
search = search.cleaned_data['search_field']
query1 = Q()
for s in states:
query1 = query1 | Q(state=s)
connexion = []
recherche = {'users_list': None, 'emprunts_list': None, 'medias_list': None, 'jeux_list': None}
if request.user.has_perms(('perm',)):
query = Q(user__pseudo__icontains=search) | Q(user__name__icontains=search) | Q(user__surname__icontains=search)
query = Q(user__username__icontains=search) | Q(user__name__icontains=search) | Q(
user__surname__icontains=search)
else:
query = (Q(user__pseudo__icontains=search) | Q(user__name__icontains=search) | Q(
query = (Q(user__username__icontains=search) | Q(user__name__icontains=search) | Q(
user__surname__icontains=search)) & Q(user=request.user)
for i in aff:
if i == '0':
query_user_list = Q(pseudo__icontains=search) | Q(name__icontains=search) | Q(
query_user_list = Q(username__icontains=search) | Q(name__icontains=search) | Q(
surname__icontains=search) & query1
if request.user.has_perms(('perm',)):
recherche['users_list'] = User.objects.filter(query_user_list).order_by('state', 'surname')
recherche['users_list'] = User.objects.filter(query_user_list).order_by('surname')
else:
recherche['users_list'] = User.objects.filter(query_user_list & Q(id=request.user.id)).order_by('state',
'surname')
recherche['users_list'] = User.objects.filter(query_user_list & Q(id=request.user.id)).order_by(
'surname')
if i == '1':
recherche['emprunts_list'] = Emprunt.objects.filter(query & date_query).order_by('date_emprunt').reverse()
if i == '2':
@@ -67,11 +62,11 @@ def search_result(search, type, request):
Q(auteur__nom__icontains=search) | Q(titre__icontains=search))
if i == '3':
recherche['jeux_list'] = Jeu.objects.filter(
Q(nom__icontains=search) | Q(proprietaire__pseudo__icontains=search) | Q(
Q(nom__icontains=search) | Q(proprietaire__username__icontains=search) | Q(
proprietaire__name__icontains=search) | Q(proprietaire__surname__icontains=search))
for r in recherche:
if recherche[r] != None:
if recherche[r] is not None:
recherche[r] = recherche[r][:SEARCH_DISPLAY_PAGE]
recherche.update({'max_result': SEARCH_DISPLAY_PAGE})