8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-16 00:13:12 +00:00

Merge branch '233-group-members-display' into 'dev'

233 group members display

See merge request federez/re2o!449
This commit is contained in:
chirac 2019-09-30 15:21:26 +02:00
commit 1ec299037e

View file

@ -919,18 +919,15 @@ def index_listright(request):
.order_by('name') .order_by('name')
.prefetch_related('permissions') .prefetch_related('permissions')
.prefetch_related('user_set') .prefetch_related('user_set')
.prefetch_related('user_set__facture_set__vente_set__cotisation')
): ):
rights[right] = (right.user_set rights[right] = (right.user_set
.annotate(action_number=Count('revision'), .annotate(action_number=Count('revision'),
last_seen=Max('revision__date_created'), last_seen=Max('revision__date_created'))
end_adhesion=Max('facture__vente__cotisation__date_end'))
) )
superusers = (User.objects superusers = (User.objects
.filter(is_superuser=True) .filter(is_superuser=True)
.annotate(action_number=Count('revision'), .annotate(action_number=Count('revision'),
last_seen=Max('revision__date_created'), last_seen=Max('revision__date_created'))
end_adhesion=Max('facture__vente__cotisation__date_end'))
) )
return render( return render(
request, request,