mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-25 22:22:26 +00:00
Fix #223
This commit is contained in:
parent
1eed57cf8f
commit
3be0b48c1b
1 changed files with 3 additions and 6 deletions
|
@ -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,
|
||||||
|
@ -978,7 +975,7 @@ def profil(request, users, **_kwargs):
|
||||||
request.GET.get('order'),
|
request.GET.get('order'),
|
||||||
SortTable.MACHINES_INDEX
|
SortTable.MACHINES_INDEX
|
||||||
)
|
)
|
||||||
|
|
||||||
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
|
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
|
||||||
optionnal_templates_list = [app.views.profil(request,users) for app in optionnal_apps]
|
optionnal_templates_list = [app.views.profil(request,users) for app in optionnal_apps]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue