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

Merge branch 'master' into 'fix_distinct'

Browse source 
# Conflicts:
#   apps/activity/views.py
This commit is contained in:
Pierre-antoine Comby 2020-04-09 22:30:19 +02:00
commit 68808ddece
54 changed files with 2698 additions and 809 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/activity/views.py
View file

@ -154,4 +154,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
ctx["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
ctx["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
ctx["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 ctx