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

Ajoute les sorts sur les bans et les whitelists

Browse source
This commit is contained in:
Maël Kervella 2017-10-21 21:45:21 +00:00
parent 95ad603ab5
commit 46e1b784d6
5 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
re2o/utils.py
View file

@ -151,12 +151,26 @@ class SortTable:
# to use as order field in the request. A 'default' might be provided to # to use as order field in the request. A 'default' might be provided to
# specify what to do if the requested col doesn't match any keys. # specify what to do if the requested col doesn't match any keys.
USERS_INDEX = { USERS_INDEX = {
'prenom' : 'name', 'name': 'name',
'nom' : 'surname', 'surname': 'surname',
'pseudo': 'pseudo', 'pseudo': 'pseudo',
'chamber' : 'room', 'room': 'room',
'default': 'pseudo' 'default': 'pseudo'
} }
USERS_INDEX_BAN = {
'user': 'user__pseudo',
'reason': 'raison',
'start': 'date_start',
'end': 'date_end',
'default': 'date_end'
}
USERS_INDEX_WHITE = {
'user': 'user__pseudo',
'reason': 'raison',
'start': 'date_start',
'end': 'date_end',
'default': 'date_end'
}
@staticmethod @staticmethod
def sort(request, col, order, criterion): def sort(request, col, order, criterion):

8
users/templates/users/aff_bans.html
View file

@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>Utilisateur</th> <th>{% include "buttons/sort.html" with col="user" text="Utilisateur" %}</th>
<th>Raison</th> <th>{% include "buttons/sort.html" with col="reason" text="Raison" %}</th>
<th>Date de début</th> <th>{% include "buttons/sort.html" with col="start" text="Date de début" %}</th>
<th>Date de fin</th> <th>{% include "buttons/sort.html" with col="end" text="Date de fin" %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>

8
users/templates/users/aff_users.html
View file

@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>{% include "buttons/sort.html" with col="prenom" text="Prénom" %}</th> <th>{% include "buttons/sort.html" with col="name" text="Prénom" %}</th>
<th>Nom</th> <th>{% include "buttons/sort.html" with col="surname" text="Nom" %}</th>
<th>Pseudo</th> <th>{% include "buttons/sort.html" with col="pseudo" text="Pseudo" %}</th>
<th>Chambre</th> <th>{% include "buttons/sort.html" with col="room" text="Chambre" %}</th>
<th>Fin de cotisation le</th> <th>Fin de cotisation le</th>
<th>Connexion</th> <th>Connexion</th>
<th>Profil</th> <th>Profil</th>

8
users/templates/users/aff_whitelists.html
View file

@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>Utilisateur</th> <th>{% include "buttons/sort.html" with col="user" text="Utilisateur" %}</th>
<th>Raison</th> <th>{% include "buttons/sort.html" with col="reason" text="Raison" %}</th>
<th>Date de début</th> <th>{% include "buttons/sort.html" with col="start" text="Date de début" %}</th>
<th>Date de fin</th> <th>{% include "buttons/sort.html" with col="end" text="Date de fin" %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>

18
users/views.py
View file

@ -601,8 +601,13 @@ def index_ban(request):
""" Affiche l'ensemble des ban, need droit cableur """ """ Affiche l'ensemble des ban, need droit cableur """
options, _created = GeneralOption.objects.get_or_create() options, _created = GeneralOption.objects.get_or_create()
pagination_number = options.pagination_number pagination_number = options.pagination_number
ban_list = Ban.objects.order_by('date_start')\ ban_list = Ban.objects.select_related('user')
.select_related('user').reverse() ban_list = SortTable.sort(
ban_list,
request.GET.get('col'),
request.GET.get('order'),
SortTable.USERS_INDEX_BAN
)
paginator = Paginator(ban_list, pagination_number) paginator = Paginator(ban_list, pagination_number)
page = request.GET.get('page') page = request.GET.get('page')
try: try:
@ -622,8 +627,13 @@ def index_white(request):
""" Affiche l'ensemble des whitelist, need droit cableur """ """ Affiche l'ensemble des whitelist, need droit cableur """
options, _created = GeneralOption.objects.get_or_create() options, _created = GeneralOption.objects.get_or_create()
pagination_number = options.pagination_number pagination_number = options.pagination_number
white_list = Whitelist.objects.select_related('user')\ white_list = Whitelist.objects.select_related('user')
.order_by('date_start') white_list = SortTable.sort(
white_list,
request.GET.get('col'),
request.GET.get('order'),
SortTable.USERS_INDEX_BAN
)
paginator = Paginator(white_list, pagination_number) paginator = Paginator(white_list, pagination_number)
page = request.GET.get('page') page = request.GET.get('page')
try: try: