jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'explicit>implicit'

Browse source 
# Conflicts:
#   apps/activity/views.py
This commit is contained in:
Pierre-antoine Comby 2020-04-09 22:31:54 +02:00
commit 99d3ba9c1a
54 changed files with 2700 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/activity/views.py
View file

@ -139,6 +139,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
| Q(name__regex=pattern)
| Q(normalized_name__regex=Alias.normalize(pattern)))) \
.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\
.filter(note__noteuser__user__profile__registration_valid=True)\
.distinct("username")[:20]
for note in note_qs:
note.type = "Adhérent"
@ -153,5 +154,9 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
context["title"] = _('Entry for activity "{}"').format(activity.name)
context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
context["activities_open"] = Activity.objects.filter(open=True).filter(
PermissionBackend.filter_queryset(self.request.user, Activity, "view")).filter(
PermissionBackend.filter_queryset(self.request.user, Activity, "change")).all()
return context
return context