Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
c029feec
Commit
c029feec
authored
Oct 22, 2017
by
Maël Kervella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ajout de prefix sur tous les tableaux pour les différencier
parent
29a81fc1
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
85 additions
and
74 deletions
+85
-74
cotisations/templates/cotisations/aff_cotisations.html
cotisations/templates/cotisations/aff_cotisations.html
+3
-3
cotisations/templates/cotisations/control.html
cotisations/templates/cotisations/control.html
+6
-6
logs/templates/logs/aff_stats_logs.html
logs/templates/logs/aff_stats_logs.html
+2
-2
logs/templates/logs/aff_summary.html
logs/templates/logs/aff_summary.html
+1
-1
machines/templates/machines/aff_machines.html
machines/templates/machines/aff_machines.html
+1
-1
re2o/utils.py
re2o/utils.py
+37
-37
templates/buttons/sort.html
templates/buttons/sort.html
+11
-0
topologie/templates/topologie/aff_chambres.html
topologie/templates/topologie/aff_chambres.html
+1
-1
topologie/templates/topologie/aff_port.html
topologie/templates/topologie/aff_port.html
+6
-6
topologie/templates/topologie/aff_stacks.html
topologie/templates/topologie/aff_stacks.html
+2
-2
topologie/templates/topologie/aff_switch.html
topologie/templates/topologie/aff_switch.html
+5
-5
users/templates/users/aff_bans.html
users/templates/users/aff_bans.html
+3
-3
users/templates/users/aff_users.html
users/templates/users/aff_users.html
+4
-4
users/templates/users/aff_whitelists.html
users/templates/users/aff_whitelists.html
+3
-3
No files found.
cotisations/templates/cotisations/aff_cotisations.html
View file @
c029feec
...
...
@@ -29,11 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='user' text='Utilisateur' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='cotis'
col='user' text='Utilisateur' %}
</th>
<th>
Designation
</th>
<th>
Prix total
</th>
<th>
{% include "buttons/sort.html" with col='paiement' text='Moyen de paiement' %}
</th>
<th>
{% include "buttons/sort.html" with col='date' text='Date' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='cotis'
col='paiement' text='Moyen de paiement' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='cotis'
col='date' text='Date' %}
</th>
<th></th>
<th></th>
<th></th>
...
...
cotisations/templates/cotisations/control.html
View file @
c029feec
...
...
@@ -40,14 +40,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<thead>
<tr>
<th>
Profil
</th>
<th>
{% include "buttons/sort.html" with col='name' text='Nom' %}
</th>
<th>
{% include "buttons/sort.html" with col='surname' text='Prénom' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='name' text='Nom' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='surname' text='Prénom' %}
</th>
<th>
Designation
</th>
<th>
Prix total
</th>
<th>
{% include "buttons/sort.html" with col='paiement' text='Moyen de paiement' %}
</th>
<th>
{% include "buttons/sort.html" with col='date' text='Date' %}
</th>
<th>
{% include "buttons/sort.html" with col='valid' text='Valide' %}
</th>
<th>
{% include "buttons/sort.html" with col='control' text='Contrôlée' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='paiement' text='Moyen de paiement' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='date' text='Date' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='valid' text='Valide' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='control'
col='control' text='Contrôlée' %}
</th>
</tr>
</thead>
{% for form in controlform.forms %}
...
...
logs/templates/logs/aff_stats_logs.html
View file @
c029feec
...
...
@@ -33,8 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr>
<th>
Objet modifié
</th>
<th>
Type de l'objet
</th>
<th>
{% include "buttons/sort.html" with col='author' text='Modification par' %}
</th>
<th>
{% include "buttons/sort.html" with col='date' text='Date de modification' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='logs'
col='author' text='Modification par' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='logs'
col='date' text='Date de modification' %}
</th>
<th>
Commentaire
</th>
<th></th>
</tr>
...
...
logs/templates/logs/aff_summary.html
View file @
c029feec
...
...
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='date' text='Date' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='sum'
col='date' text='Date' %}
</th>
<th>
Modification
</th>
<th></th>
</tr>
...
...
machines/templates/machines/aff_machines.html
View file @
c029feec
...
...
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<col
width=
"144px"
>
</colgroup>
<thead>
<th>
{% include "buttons/sort.html" with col='name' text='Nom DNS' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='machine'
col='name' text='Nom DNS' %}
</th>
<th>
Type
</th>
<th>
MAC
</th>
<th>
IP
</th>
...
...
re2o/utils.py
View file @
c029feec
...
...
@@ -153,76 +153,76 @@ class SortTable:
# A 'default' might be provided to specify what to do if the requested col
# doesn't match any keys.
USERS_INDEX
=
{
'name'
:
[
'name'
],
'surname'
:
[
'surname'
],
'pseudo'
:
[
'pseudo'
],
'room'
:
[
'room'
],
'
user_
name'
:
[
'name'
],
'
user_
surname'
:
[
'surname'
],
'
user_
pseudo'
:
[
'pseudo'
],
'
user_
room'
:
[
'room'
],
'default'
:
[
'state'
,
'pseudo'
]
}
USERS_INDEX_BAN
=
{
'user'
:
[
'user__pseudo'
],
'start'
:
[
'date_start'
],
'end'
:
[
'date_end'
],
'
ban_
user'
:
[
'user__pseudo'
],
'
ban_
start'
:
[
'date_start'
],
'
ban_
end'
:
[
'date_end'
],
'default'
:
[
'-date_end'
]
}
USERS_INDEX_WHITE
=
{
'user'
:
[
'user__pseudo'
],
'start'
:
[
'date_start'
],
'end'
:
[
'date_end'
],
'
white_
user'
:
[
'user__pseudo'
],
'
white_
start'
:
[
'date_start'
],
'
white_
end'
:
[
'date_end'
],
'default'
:
[
'-date_end'
]
}
MACHINES_INDEX
=
{
'name'
:
[
'name'
],
'
machine_
name'
:
[
'name'
],
'default'
:
[
'pk'
]
}
COTISATIONS_INDEX
=
{
'user'
:
[
'user__pseudo'
],
'paiement'
:
[
'paiement__moyen'
],
'date'
:
[
'date'
],
'
cotis_
user'
:
[
'user__pseudo'
],
'
cotis_
paiement'
:
[
'paiement__moyen'
],
'
cotis_
date'
:
[
'date'
],
'default'
:
[
'-date'
]
}
COTISATIONS_CONTROL
=
{
'name'
:
[
'user__name'
],
'surname'
:
[
'user__surname'
],
'paiement'
:
[
'paiement'
],
'date'
:
[
'date'
],
'valid'
:
[
'valid'
],
'control'
:
[
'control'
],
'
control_
name'
:
[
'user__name'
],
'
control_
surname'
:
[
'user__surname'
],
'
control_
paiement'
:
[
'paiement'
],
'
control_
date'
:
[
'date'
],
'
control_
valid'
:
[
'valid'
],
'control
_control
'
:
[
'control'
],
'default'
:
[
'-date'
]
}
TOPOLOGIE_INDEX
=
{
'dns'
:
[
'switch_interface__domain__name'
],
'ip'
:
[
'switch_interface__ipv4__ipv4'
],
'loc'
:
[
'location'
],
'ports'
:
[
'number'
],
'stack'
:
[
'stack__name'
],
'
switch_
dns'
:
[
'switch_interface__domain__name'
],
'
switch_
ip'
:
[
'switch_interface__ipv4__ipv4'
],
'
switch_
loc'
:
[
'location'
],
'
switch_
ports'
:
[
'number'
],
's
witch_s
tack'
:
[
'stack__name'
],
'default'
:
[
'location'
,
'stack'
,
'stack_member_id'
]
}
TOPOLOGIE_INDEX_PORT
=
{
'port'
:
[
'port'
],
'room'
:
[
'room__name'
],
'interface'
:
[
'machine_interface__domain__name'
],
'related'
:
[
'related__switch__name'
],
'radius'
:
[
'radius'
],
'vlan'
:
[
'vlan_force__name'
],
'port
_port
'
:
[
'port'
],
'
port_
room'
:
[
'room__name'
],
'
port_
interface'
:
[
'machine_interface__domain__name'
],
'
port_
related'
:
[
'related__switch__name'
],
'
port_
radius'
:
[
'radius'
],
'
port_
vlan'
:
[
'vlan_force__name'
],
'default'
:
[
'port'
]
}
TOPOLOGIE_INDEX_ROOM
=
{
'name'
:
[
'name'
],
'
room_
name'
:
[
'name'
],
'default'
:
[
'name'
]
}
TOPOLOGIE_INDEX_STACK
=
{
'name'
:
[
'name'
],
'id'
:
[
'stack_id'
],
'
stack_
name'
:
[
'name'
],
'
stack_
id'
:
[
'stack_id'
],
'default'
:
[
'stack_id'
],
}
LOGS_INDEX
=
{
'date'
:
[
'revision__date_created'
],
'
sum_
date'
:
[
'revision__date_created'
],
'default'
:
[
'-revision__date_created'
],
}
LOGS_STATS_LOGS
=
{
'author'
:
[
'user__name'
],
'date'
:
[
'date_created'
],
'
logs_
author'
:
[
'user__name'
],
'
logs_
date'
:
[
'date_created'
],
'default'
:
[
'-date_created'
]
}
...
...
templates/buttons/sort.html
View file @
c029feec
...
...
@@ -28,12 +28,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
style=
"display: flex; padding: 0;"
>
{{ text }}
<div
style=
"display: grid; font-size: 9px; line-height: 1; margin: auto 0;"
>
{% if prefix %}
{% with prefix|add:'_'|add:col as colname %}
<a
role=
"button"
href=
"{% url_insert_param request.get_full_path col=colname order='asc' %}"
title=
"{{ desc|default:"
Tri
croissant
"
}}"
>
<span
class=
"glyphicon glyphicon-triangle-top"
></span>
</a>
<a
role=
"button"
href=
"{% url_insert_param request.get_full_path col=colname order='desc' %}"
title=
"{{ desc|default:"
Tri
décroissant
"
}}"
>
<span
class=
"glyphicon glyphicon-triangle-bottom"
></span>
</a>
{% endwith %}
{% else %}
<a
role=
"button"
href=
"{% url_insert_param request.get_full_path col=col order='asc' %}"
title=
"{{ desc|default:"
Tri
croissant
"
}}"
>
<span
class=
"glyphicon glyphicon-triangle-top"
></span>
</a>
<a
role=
"button"
href=
"{% url_insert_param request.get_full_path col=col order='desc' %}"
title=
"{{ desc|default:"
Tri
décroissant
"
}}"
>
<span
class=
"glyphicon glyphicon-triangle-bottom"
></span>
</a>
{% endif %}
</div>
</div>
{% endspaceless %}
topologie/templates/topologie/aff_chambres.html
View file @
c029feec
...
...
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='name' text='Chambre' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='room'
col='name' text='Chambre' %}
</th>
<th>
Commentaire
</th>
<th></th>
</tr>
...
...
topologie/templates/topologie/aff_port.html
View file @
c029feec
...
...
@@ -25,12 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='port' text='Port' %}
</th>
<th>
{% include "buttons/sort.html" with col='room' text='Room' %}
</th>
<th>
{% include "buttons/sort.html" with col='interface' text='Interface machine' %}
</th>
<th>
{% include "buttons/sort.html" with col='related' text='Related' %}
</th>
<th>
{% include "buttons/sort.html" with col='radius' text='Radius' %}
</th>
<th>
{% include "buttons/sort.html" with col='vlan' text='Vlan forcé' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='port' text='Port' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='room' text='Room' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='interface' text='Interface machine' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='related' text='Related' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='radius' text='Radius' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='port'
col='vlan' text='Vlan forcé' %}
</th>
<th>
Détails
</th>
<th></th>
</tr>
...
...
topologie/templates/topologie/aff_stacks.html
View file @
c029feec
...
...
@@ -25,8 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='name' text='Stack' %}
</th>
<th>
{% include "buttons/sort.html" with col='id' text='ID' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='stack'
col='name' text='Stack' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='stack'
col='id' text='ID' %}
</th>
<th>
Détails
</th>
<th>
Membres
</th>
</tr>
...
...
topologie/templates/topologie/aff_switch.html
View file @
c029feec
...
...
@@ -25,11 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col='dns' text='Dns' %}
</th>
<th>
{% include "buttons/sort.html" with col='ip' text='Ipv4' %}
</th>
<th>
{% include "buttons/sort.html" with col='loc' text='Localisation' %}
</th>
<th>
{% include "buttons/sort.html" with col='ports' text='Ports' %}
</th>
<th>
{% include "buttons/sort.html" with col='stack' text='Stack' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='switch'
col='dns' text='Dns' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='switch'
col='ip' text='Ipv4' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='switch'
col='loc' text='Localisation' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='switch'
col='ports' text='Ports' %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='switch'
col='stack' text='Stack' %}
</th>
<th>
Id interne stack
</th>
<th>
Détails
</th>
<th></th>
...
...
users/templates/users/aff_bans.html
View file @
c029feec
...
...
@@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col="user" text="Utilisateur" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='ban'
col="user" text="Utilisateur" %}
</th>
<th>
Raison
</th>
<th>
{% include "buttons/sort.html" with col="start" text="Date de début" %}
</th>
<th>
{% include "buttons/sort.html" with col="end" text="Date de fin" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='ban'
col="start" text="Date de début" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='ban'
col="end" text="Date de fin" %}
</th>
<th></th>
</tr>
</thead>
...
...
users/templates/users/aff_users.html
View file @
c029feec
...
...
@@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col="name" text="Prénom" %}
</th>
<th>
{% include "buttons/sort.html" with col="surname" text="Nom" %}
</th>
<th>
{% include "buttons/sort.html" with col="pseudo" text="Pseudo" %}
</th>
<th>
{% include "buttons/sort.html" with col="room" text="Chambre" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='user'
col="name" text="Prénom" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='user'
col="surname" text="Nom" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='user'
col="pseudo" text="Pseudo" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='user'
col="room" text="Chambre" %}
</th>
<th>
Fin de cotisation le
</th>
<th>
Connexion
</th>
<th>
Profil
</th>
...
...
users/templates/users/aff_whitelists.html
View file @
c029feec
...
...
@@ -29,10 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
{% include "buttons/sort.html" with col="user" text="Utilisateur" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='white'
col="user" text="Utilisateur" %}
</th>
<th>
Raison
</th>
<th>
{% include "buttons/sort.html" with col="start" text="Date de début" %}
</th>
<th>
{% include "buttons/sort.html" with col="end" text="Date de fin" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='white'
col="start" text="Date de début" %}
</th>
<th>
{% include "buttons/sort.html" with
prefix='white'
col="end" text="Date de fin" %}
</th>
<th></th>
</tr>
</thead>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment