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
698a759f
Commit
698a759f
authored
Sep 13, 2017
by
Maël Kervella
Committed by
Pierre Cadart
Sep 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Met en avant les ban et les whitelist (couleur rouge et verte)
parent
10fdf1d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
7 deletions
+51
-7
logs/templates/logs/aff_summary.html
logs/templates/logs/aff_summary.html
+51
-7
No files found.
logs/templates/logs/aff_summary.html
View file @
698a759f
...
...
@@ -37,9 +37,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr>
</thead>
{% for rev in reversions_list %}
<tr>
{% if rev.rev.content_type.name == 'ban' %}
<tr
class=
"danger"
>
<td>
{{ rev.datetime }}
</td>
{% if rev.rev.content_type.name == 'ban' %}
<td>
{{ rev.username }} a banni
<a
href=
"{% url 'users:profil' rev.rev.object.user_id %}"
>
{{ rev.rev.object.user.get_username }}
</a>
...
...
@@ -51,7 +51,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
</i>
)
</td>
{% elif rev.rev.content_type.name == 'whitelist' %}
{% if is_bureau %}
<td>
<a
class=
"btn btn-danger btn-sm"
role=
"button"
href=
"{% url 'logs:revert-action' rev.id %}"
>
<i
class=
"glyphicon glyphicon-remove"
></i>
Annuler
</a>
</td>
{% endif %}
</tr>
{% elif rev.rev.content_type.name == 'whitelist' %}
<tr
class=
"success"
>
<td>
{{ rev.datetime }}
</td>
<td>
{{ rev.username }} a autorisé gracieusement
<a
href=
"{% url 'users:profil' rev.rev.object.user_id %}"
>
{{ rev.rev.object.user.get_username }}
</a>
...
...
@@ -63,7 +74,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
</i>
)
</td>
{% elif rev.rev.content_type.name == 'user' %}
{% if is_bureau %}
<td>
<a
class=
"btn btn-danger btn-sm"
role=
"button"
href=
"{% url 'logs:revert-action' rev.id %}"
>
<i
class=
"glyphicon glyphicon-remove"
></i>
Annuler
</a>
</td>
{% endif %}
</tr>
{% elif rev.rev.content_type.name == 'user' %}
<tr>
<td>
{{ rev.datetime }}
</td>
<td>
{{ rev.username }} a mis à jour
<a
href=
"{% url 'users:profil' rev.rev.object.id %}"
>
{{ rev.rev.object.get_username }}
</a>
...
...
@@ -71,7 +93,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
(
<i>
{{ rev.comment }}
</i>
)
{% endif %}
</td>
{% elif rev.rev.content_type.name == 'vente' %}
{% if is_bureau %}
<td>
<a
class=
"btn btn-danger btn-sm"
role=
"button"
href=
"{% url 'logs:revert-action' rev.id %}"
>
<i
class=
"glyphicon glyphicon-remove"
></i>
Annuler
</a>
</td>
{% endif %}
</tr>
{% elif rev.rev.content_type.name == 'vente' %}
<tr>
<td>
{{ rev.datetime }}
</td>
<td>
{{ rev.username }} a vendu {{ rev.rev.object.number }}x {{ rev.rev.object.name }} à
<a
href=
"{% url 'users:profil' rev.rev.object.facture.user_id %}"
>
{{ rev.rev.object.facture.user.get_username }}
</a>
...
...
@@ -79,7 +112,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
(
<i>
+{{ rev.rev.object.duration }} mois
</i>
)
{% endif %}
</td>
{% elif rev.rev.content_type.name == 'interface' %}
{% if is_bureau %}
<td>
<a
class=
"btn btn-danger btn-sm"
role=
"button"
href=
"{% url 'logs:revert-action' rev.id %}"
>
<i
class=
"glyphicon glyphicon-remove"
></i>
Annuler
</a>
</td>
{% endif %}
</tr>
{% elif rev.rev.content_type.name == 'interface' %}
<tr>
<td>
{{ rev.datetime }}
</td>
<td>
{{ rev.username }} a modifié une interface de
<a
href=
"{% url 'users:profil' rev.rev.object.machine.user_id %}"
>
{{ rev.rev.object.machine.user.get_username }}
</a>
...
...
@@ -87,7 +131,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
(
<i>
{{ rev.comment }}
</i>
)
{% endif %}
</td>
{% endif %}
{% if is_bureau %}
<td>
<a
class=
"btn btn-danger btn-sm"
role=
"button"
href=
"{% url 'logs:revert-action' rev.id %}"
>
...
...
@@ -97,6 +140,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</td>
{% endif %}
</tr>
{% endif %}
{% endfor %}
</table>
...
...
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