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
02e03073
Commit
02e03073
authored
Oct 31, 2016
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Affichage des dernières actions
parent
9be7e8a0
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
96 additions
and
3 deletions
+96
-3
logs/templates/logs/aff_actions.html
logs/templates/logs/aff_actions.html
+26
-0
logs/templates/logs/index.html
logs/templates/logs/index.html
+12
-0
logs/templates/logs/sidebar.html
logs/templates/logs/sidebar.html
+6
-0
logs/templatetags/__init__.py
logs/templatetags/__init__.py
+0
-0
logs/templatetags/logs_extra.py
logs/templatetags/logs_extra.py
+8
-0
logs/urls.py
logs/urls.py
+7
-0
logs/views.py
logs/views.py
+35
-1
re2o/urls.py
re2o/urls.py
+1
-1
templates/base.html
templates/base.html
+1
-1
No files found.
logs/templates/logs/aff_actions.html
0 → 100644
View file @
02e03073
{% if revisions_list.paginator %}
{% include "pagination.html" with list=revisions_list %}
{% endif %}
{% load logs_extra %}
<table
class=
"table table-striped"
>
<thead>
<tr>
<th>
Objet modifié
</th>
<th>
Type de l'objet
</th>
<th>
Modification par
</th>
<th>
Date de modification
</th>
<th>
Commentaire
</th>
</tr>
</thead>
{% for revision in revisions_list %}
<tr>
<td>
{% for reversion in revision.version_set.all %}{{ reversion.object|truncatechars:20 }}{% endfor %}
</td>
<td>
{% for reversion in revision.version_set.all %}{{ reversion.object|classname }}{% endfor %}
</td>
<td>
{{ revision.user }}
</td>
<td>
{{ revision.date_created }}
</td>
<td>
{{ revision.comment }}
</td>
</tr>
{% endfor %}
</table>
logs/templates/logs/index.html
0 → 100644
View file @
02e03073
{% extends "logs/sidebar.html" %}
{% load bootstrap3 %}
{% block title %}Statistiques{% endblock %}
{% block content %}
<h2>
Actions effectuées
</h2>
{% include "logs/aff_actions.html" with revisions_list=revisions_list %}
<br
/>
<br
/>
<br
/>
{% endblock %}
logs/templates/logs/sidebar.html
0 → 100644
View file @
02e03073
{% extends "base.html" %}
{% block sidebar %}
{% if is_cableur %}
{% endif %}
{% endblock %}
logs/templatetags/__init__.py
0 → 100644
View file @
02e03073
logs/templatetags/logs_extra.py
0 → 100644
View file @
02e03073
from
django
import
template
register
=
template
.
Library
()
@
register
.
filter
def
classname
(
obj
):
return
obj
.
__class__
.
__name__
logs/urls.py
0 → 100644
View file @
02e03073
from
django.conf.urls
import
url
from
.
import
views
urlpatterns
=
[
url
(
r
'^$'
,
views
.
index
,
name
=
'index'
),
]
logs/views.py
View file @
02e03073
from
django.shortcuts
import
render
# App de gestion des statistiques pour re2o
# Gabriel Détraz
# Gplv2
from
django.http
import
HttpResponse
from
django.shortcuts
import
render
,
redirect
from
django.shortcuts
import
render_to_response
,
get_object_or_404
from
django.core.context_processors
import
csrf
from
django.core.paginator
import
Paginator
,
EmptyPage
,
PageNotAnInteger
from
django.template
import
Context
,
RequestContext
,
loader
from
django.contrib
import
messages
from
django.contrib.auth.decorators
import
login_required
,
permission_required
from
django.db.models
import
ProtectedError
from
django.forms
import
ValidationError
from
django.db
import
transaction
from
reversion.models
import
Revision
from
reversion.models
import
Version
from
re2o.settings
import
PAGINATION_NUMBER
,
PAGINATION_LARGE_NUMBER
@
login_required
@
permission_required
(
'cableur'
)
def
index
(
request
):
revisions
=
Revision
.
objects
.
all
().
order_by
(
'date_created'
).
reverse
()
paginator
=
Paginator
(
revisions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
revisions
=
paginator
.
page
(
page
)
except
PageNotAnInteger
:
# If page is not an integer, deliver first page.
revisions
=
paginator
.
page
(
1
)
except
EmptyPage
:
# If page is out of range (e.g. 9999), deliver last page of results.
revisions
=
paginator
.
page
(
paginator
.
num_pages
)
return
render
(
request
,
'logs/index.html'
,
{
'revisions_list'
:
revisions
})
re2o/urls.py
View file @
02e03073
...
...
@@ -28,5 +28,5 @@ urlpatterns = [
url
(
r
'^cotisations/'
,
include
(
'cotisations.urls'
,
namespace
=
'cotisations'
)),
url
(
r
'^machines/'
,
include
(
'machines.urls'
,
namespace
=
'machines'
)),
url
(
r
'^topologie/'
,
include
(
'topologie.urls'
,
namespace
=
'topologie'
)),
#
url(r'^logs/', include('logs.urls', namespace='logs')),
url
(
r
'^logs/'
,
include
(
'logs.urls'
,
namespace
=
'logs'
)),
]
templates/base.html
View file @
02e03073
...
...
@@ -35,7 +35,7 @@
<li><a
href=
"{% url "
machines:index
"
%}"
>
Machines
</a></li>
<li><a
href=
"{% url "
cotisations:index
"
%}"
>
Cotisations
</a></li>
<li><a
href=
"{% url "
topologie:index
"
%}"
>
Topologie
</a></li>
<li><a
href=
"
#
"
>
Statistiques
</a></li>
<li><a
href=
"
{% url "
logs:index
"
%}
"
>
Statistiques
</a></li>
{% endif %}
</ul>
<div
class=
"col-sm-3 col-md-3 navbar-right"
>
...
...
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