Move adhesion to admin
This commit is contained in:
Alexandre Iooss
parent
a139c2339c
commit
4049582f1e
|
|
@ -1,46 +0,0 @@
|
|||
{% comment %}
|
||||
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||
se veut agnostique au réseau considéré, de manière à être installable en
|
||||
quelques clics.
|
||||
|
||||
Copyright © 2017 Gabriel Détraz
|
||||
Copyright © 2017 Goulven Kermarec
|
||||
Copyright © 2017 Augustin Lemesle
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
{% endcomment %}
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Année début</th>
|
||||
<th>Année fin</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% for adhesion in adhesion_list %}
|
||||
<tr>
|
||||
<td>{{ adhesion.annee_debut }}</td>
|
||||
<td>{{ adhesion.annee_fin }}</td>
|
||||
<td class="text-right">
|
||||
{% if is_bureau %}
|
||||
{% include 'buttons/edit.html' with href='users:edit-adhesion' id=adhesion.id %}
|
||||
{% include 'buttons/suppr.html' with href='users:del-adhesion' id=adhesion.id %}
|
||||
{% endif %}
|
||||
{% include 'buttons/history.html' with href='users:history' name='adhesion' id=adhesion.id %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% comment %}
|
||||
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||
se veut agnostique au réseau considéré, de manière à être installable en
|
||||
quelques clics.
|
||||
|
||||
Copyright © 2017 Gabriel Détraz
|
||||
Copyright © 2017 Goulven Kermarec
|
||||
Copyright © 2017 Augustin Lemesle
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
{% endcomment %}
|
||||
|
||||
{% load bootstrap3 %}
|
||||
|
||||
{% block title %}Adhesion{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Liste des adhesion</h2>
|
||||
{% if is_bureau %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-adhesion' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter une adhesion</a>
|
||||
{% endif %}
|
||||
{% include "users/aff_adhesion.html" with adhesion_list=adhesion_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
{% endblock %}
|
||||
|
|
@ -40,10 +40,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<i class="glyphicon glyphicon-list"></i>
|
||||
Adhérents
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-adhesion" %}">
|
||||
<i class="glyphicon glyphicon-list"></i>
|
||||
Adhesions
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-clef" %}">
|
||||
<i class="glyphicon glyphicon-list"></i>
|
||||
Clef
|
||||
|
|
|
|||
|
|
@ -16,10 +16,6 @@ urlpatterns = [
|
|||
url(r'^mon_profil/$', views.mon_profil, name='mon-profil'),
|
||||
url(r'^index_clef/$', views.index_clef, name='index-clef'),
|
||||
url(r'^history/(?P<object>clef)/(?P<id>[0-9]+)$', views.history, name='history'),
|
||||
url(r'^add_adhesion/$', views.add_adhesion, name='add-adhesion'),
|
||||
url(r'^edit_adhesion/(?P<adhesionid>[0-9]+)$', views.edit_adhesion, name='edit-adhesion'),
|
||||
url(r'^del_adhesion/(?P<adhesionid>[0-9]+)$', views.del_adhesion, name='del-adhesion'),
|
||||
url(r'^index_adhesion/$', views.index_adhesion, name='index-adhesion'),
|
||||
url(r'^history/(?P<object>adhesion)/(?P<id>[0-9]+)$', views.history, name='history'),
|
||||
url(r'^process/(?P<token>[a-z0-9]{32})/$', views.process, name='process'),
|
||||
url(r'^history/(?P<object>user)/(?P<id>[0-9]+)$', views.history, name='history'),
|
||||
|
|
|
|||
|
|
@ -135,62 +135,6 @@ def index_clef(request):
|
|||
return render(request, 'users/index_clef.html', {'clef_list': clef_list})
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('bureau')
|
||||
def add_adhesion(request):
|
||||
adhesion = AdhesionForm(request.POST or None)
|
||||
if adhesion.is_valid():
|
||||
with transaction.atomic(), reversion.create_revision():
|
||||
adhesion.save()
|
||||
reversion.set_user(request.user)
|
||||
reversion.set_comment("Création")
|
||||
messages.success(request, "L'adhesion a été ajouté")
|
||||
return redirect("/users/index_adhesion/")
|
||||
return form({'userform': adhesion}, 'users/user.html', request)
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('bureau')
|
||||
def edit_adhesion(request, adhesionid):
|
||||
try:
|
||||
adhesion_instance = Adhesion.objects.get(pk=adhesionid)
|
||||
except Adhesion.DoesNotExist:
|
||||
messages.error(request, u"Entrée inexistante")
|
||||
return redirect("/users/index_adhesion/")
|
||||
adhesion = AdhesionForm(request.POST or None, instance=adhesion_instance)
|
||||
if adhesion.is_valid():
|
||||
with transaction.atomic(), reversion.create_revision():
|
||||
adhesion.save()
|
||||
reversion.set_user(request.user)
|
||||
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in adhesion.changed_data))
|
||||
messages.success(request, "Adhesion modifiée")
|
||||
return redirect("/users/index_adhesion/")
|
||||
return form({'userform': adhesion}, 'users/user.html', request)
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('bureau')
|
||||
def del_adhesion(request, adhesionid):
|
||||
try:
|
||||
adhesion_instance = Adhesion.objects.get(pk=adhesionid)
|
||||
except Adhesion.DoesNotExist:
|
||||
messages.error(request, u"Entrée inexistante")
|
||||
return redirect("/users/index_adhesion/")
|
||||
if request.method == "POST":
|
||||
with transaction.atomic(), reversion.create_revision():
|
||||
adhesion_instance.delete()
|
||||
reversion.set_user(request.user)
|
||||
messages.success(request, "La adhesion a été détruit")
|
||||
return redirect("/users/index_adhesion")
|
||||
return form({'objet': adhesion_instance, 'objet_name': 'adhesion'}, 'users/delete.html', request)
|
||||
|
||||
|
||||
@login_required
|
||||
def index_adhesion(request):
|
||||
adhesion_list = Adhesion.objects.all()
|
||||
return render(request, 'users/index_adhesion.html', {'adhesion_list': adhesion_list})
|
||||
|
||||
|
||||
@login_required
|
||||
@permission_required('perm')
|
||||
def index(request):
|
||||
|
|
|
|||
Loading…
Reference in New Issue