rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_86_number_of_machines' into 'master'

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
machines/templates/machines/aff_machines.html
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 %} {% include "pagination.html" with list=machines_list %}
{% endif %} {% endif %}
<table class="table" id="machines_table"> <table class="table" id="machines_table">
<colgroup> <colgroup>
<col> <col>

2
users/templates/users/profil.html
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"> <h3 class="panel-title pull-left">
<i class="fa fa-desktop"></i> <i class="fa fa-desktop"></i>
Machines Machines
<span class="badge">{{machines_list.count}}</span> <span class="badge">{{nb_machines}}</span>
</h3> </h3>
</div> </div>
<div id="collapse3" class="panel-collapse collapse"> <div id="collapse3" class="panel-collapse collapse">

2
users/views.py
View file

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