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

Merge branch 'fix_date_summary' into 'dev'

Browse source 
Fix display affichage date summary

See merge request federez/re2o!465
This commit is contained in:
klafyvel 2019-10-29 18:11:33 +01:00
commit b5000ad367
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
logs/templates/logs/aff_summary.html
View file

@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% for v in versions_list %} {% for v in versions_list %}
{% if v.version.content_type.model == 'ban' %} {% if v.version.content_type.model == 'ban' %}
<tr class="danger"> <tr class="danger">
<td>{{ v.datetime }}</td> <td>{{ v.datetime|date:"j/m/y H:i:s" }}</td>
<td> <td>
{% blocktrans with username=v.username %}{{ username }} has banned{% endblocktrans %} {% blocktrans with username=v.username %}{{ username }} has banned{% endblocktrans %}
<a href="{% url 'users:profil' v.version.object.user_id %}">{{ v.version.object.user.get_username }}</a> <a href="{% url 'users:profil' v.version.object.user_id %}">{{ v.version.object.user.get_username }}</a>
@ -66,7 +66,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
{% elif v.version.content_type.model == 'whitelist' %} {% elif v.version.content_type.model == 'whitelist' %}
<tr class="success"> <tr class="success">
<td>{{ v.datetime }}</td> <td>{{ v.datetime|date:"j/m/y H:i:s" }}</td>
<td> <td>
{% blocktrans with username=v.username %}{{ username }} has graciously authorised{% endblocktrans %} {% blocktrans with username=v.username %}{{ username }} has graciously authorised{% endblocktrans %}
<a href="{% url 'users:profil' v.version.object.user_id %}">{{ v.version.object.user.get_username }}</a> <a href="{% url 'users:profil' v.version.object.user_id %}">{{ v.version.object.user.get_username }}</a>
@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
{% elif v.version.content_type.model == 'user' %} {% elif v.version.content_type.model == 'user' %}
<tr> <tr>
<td>{{ v.datetime }}</td> <td>{{ v.datetime|date:"j/m/y H:i:s" }}</td>
<td> <td>
{% blocktrans with username=v.username %}{{ username }} has updated{% endblocktrans %} {% blocktrans with username=v.username %}{{ username }} has updated{% endblocktrans %}
<a href="{% url 'users:profil' v.version.object.id %}">{{ v.version.object.get_username }}</a> <a href="{% url 'users:profil' v.version.object.id %}">{{ v.version.object.get_username }}</a>
@ -108,7 +108,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
{% elif v.version.content_type.model == 'vente' %} {% elif v.version.content_type.model == 'vente' %}
<tr> <tr>
<td>{{ v.datetime }}</td> <td>{{ v.datetime|date:"j/m/y H:i:s" }}</td>
<td> <td>
{% blocktrans with username=v.username number=v.version.object.number name=v.version.object.name %}{{ username }} has sold {{ number }}x {{ name }}{% endblocktrans %} {% blocktrans with username=v.username number=v.version.object.number name=v.version.object.name %}{{ username }} has sold {{ number }}x {{ name }}{% endblocktrans %}
{% with invoice=v.version.object.facture %} {% with invoice=v.version.object.facture %}
@ -132,7 +132,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
{% elif v.version.content_type.model == 'interface' %} {% elif v.version.content_type.model == 'interface' %}
<tr> <tr>
<td>{{ v.datetime }}</td> <td>{{ v.datetime|date:"j/m/y H:i:s" }}</td>
<td> <td>
{% blocktrans with username=v.username %}{{ username }} has edited an interface of{% endblocktrans %} {% blocktrans with username=v.username %}{{ username }} has edited an interface of{% endblocktrans %}
<a href="{% url 'users:profil' v.version.object.machine.user_id %}">{{ v.version.object.machine.user.get_username }}</a> <a href="{% url 'users:profil' v.version.object.machine.user_id %}">{{ v.version.object.machine.user.get_username }}</a>

4
logs/views.py
View file

@ -148,9 +148,7 @@ def index(request):
versions.object_list[i] = { versions.object_list[i] = {
'rev_id': version.revision.id, 'rev_id': version.revision.id,
'comment': version.revision.comment, 'comment': version.revision.comment,
'datetime': version.revision.date_created.strftime( 'datetime': version.revision.date_created,
'%d/%m/%y %H:%M:%S'
),
'username': 'username':
version.revision.user.get_username() version.revision.user.get_username()
if version.revision.user else '?', if version.revision.user else '?',