Browse Source

Fix #86

paginateur
Hugo LEVY-FALK 8 years ago
parent
commit
e4d53e6791
  1. 1
      machines/templates/machines/aff_machines.html
  2. 2
      users/templates/users/profil.html
  3. 2
      users/views.py

1
machines/templates/machines/aff_machines.html

@ -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>

2
users/templates/users/profil.html

@ -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">

2
users/views.py

@ -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,

Loading…
Cancel
Save