ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
Code Issues Releases Wiki Activity

Show matched aliases in the autocompletion list

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-02-17 01:13:14 +01:00
parent 4bc342c668
commit 52514f58d6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/note/views.py
View File

@ -70,7 +70,7 @@ class NoteAutocomplete(autocomplete.Select2QuerySetView):
# self.q est le paramètre de la recherche
if self.q:
qs = qs.filter(Q(alias__name__regex=self.q) | Q(alias__normalized_name__regex=Alias.normalize(self.q)))
qs = qs.filter(Q(alias__name__regex=self.q) | Q(alias__normalized_name__regex=Alias.normalize(self.q))).distinct()
# Filtrage par type de note (user, club, special)
note_type = self.forwarded.get("note_type", None)
@ -87,6 +87,17 @@ class NoteAutocomplete(autocomplete.Select2QuerySetView):
return qs
def get_result_label(self, result):
aliases = Alias.objects.filter(Q(name__regex=self.q) | Q(normalized_name__regex=Alias.normalize(self.q))).all()
res = str(result)
if aliases.count() > 1 or (aliases.count() == 1 and aliases.get().name != str(result)):
res += " (alias "
for alias in aliases:
if alias.name != str(result):
res += alias.name + ", "
res = res[:-2] + ")"
return res
class TransactionTemplateCreateView(LoginRequiredMixin,CreateView):
"""