8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00

Merge branch 'fix_86_number_of_machines' into 'master'

Fix #86

Closes #86

See merge request federez/re2o!141
This commit is contained in:
moamoak 2018-04-17 00:02:01 +02:00
commit ad12dff8d5
3 changed files with 3 additions and 2 deletions

View file

@ -28,7 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include "pagination.html" with list=machines_list %}
{% endif %}
<table class="table" id="machines_table">
<colgroup>
<col>

View file

@ -245,7 +245,7 @@ non adhérent</span>{% endif %} et votre connexion est {% if users.has_access %}
<h3 class="panel-title pull-left">
<i class="fa fa-desktop"></i>
Machines
<span class="badge">{{machines_list.count}}</span>
<span class="badge">{{nb_machines}}</span>
</h3>
</div>
<div id="collapse3" class="panel-collapse collapse">

View file

@ -814,6 +814,7 @@ def profil(request, users, **_kwargs):
pagination_large_number = GeneralOption.get_cached_value(
'pagination_large_number'
)
nb_machines = machines.count()
machines = re2o_paginator(request, machines, pagination_large_number)
factures = Facture.objects.filter(user=users)
factures = SortTable.sort(
@ -844,6 +845,7 @@ def profil(request, users, **_kwargs):
{
'users': users,
'machines_list': machines,
'nb_machines' : nb_machines,
'facture_list': factures,
'ban_list': bans,
'white_list': whitelists,