From 559ac5a39d23f97c8d048b802648c098b1491428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Tue, 23 Aug 2016 21:09:47 +0200
Subject: [PATCH] On peut changer de respos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tout se fait simplement depuis la vue `/clubs/membres/<club_name>`.
Il est déconseillé de passer par l'interface admin.
---
 gestioncof/templates/home.html          |  1 +
 gestioncof/templates/liste_clubs.html   |  4 +--
 gestioncof/templates/membres_clubs.html | 35 ++++++++++++++++++++-----
 gestioncof/urls.py                      |  4 ++-
 gestioncof/views.py                     | 18 ++++++++++++-
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html
index 9d32c40c..ccd72cce 100644
--- a/gestioncof/templates/home.html
+++ b/gestioncof/templates/home.html
@@ -70,6 +70,7 @@
                     <li><a href="{% url "admin:index" %}">Administration générale</a></li>
                     <li><a href="{% url "petits-cours-demandes-list" %}">Demandes de petits cours</a></li>
                     <li><a href="{% url "gestioncof.views.registration" %}">Inscription d'un nouveau membre</a></li>
+                    <li><a href="{% url "liste-clubs" %}">Gestion des clubs</a></li>
                 </ul>
                 <ul>
                     <h4>Évènements & Sondages</h4>
diff --git a/gestioncof/templates/liste_clubs.html b/gestioncof/templates/liste_clubs.html
index 0551817e..c248a7a6 100644
--- a/gestioncof/templates/liste_clubs.html
+++ b/gestioncof/templates/liste_clubs.html
@@ -8,7 +8,7 @@
 {% for club in owned_clubs %}
   <li>
     <a href="{% url "membres-club" club.name %}">
-      {{ club }} ({% for respo in club.respos.all %}{{ respo.get_full_name }}{% empty %}pas de respo{% endfor %})
+      {{ club }} ({% for respo in club.respos.all %}{{ respo.get_full_name }}, {% empty %}pas de respo{% endfor %})
     </a>
   </li>
 {% endfor %}
@@ -16,7 +16,7 @@
 {% for club in other_clubs %}
     <li>
       <p>
-        {{ club }} ({% for respo in club.respos.all %}{{ respo.get_full_name }}{% empty %}pas de respo{% endfor %})
+        {{ club }} ({% for respo in club.respos.all %}{{ respo.get_full_name }}, {% empty %}pas de respo{% endfor %})
       </p>
     </li>
 {% endfor %}
diff --git a/gestioncof/templates/membres_clubs.html b/gestioncof/templates/membres_clubs.html
index d93e8cdb..8c932ed5 100644
--- a/gestioncof/templates/membres_clubs.html
+++ b/gestioncof/templates/membres_clubs.html
@@ -1,20 +1,41 @@
 {% extends "base_title.html" %}
 
+
 {% block realcontent %}
 <h2>{{ club }}</h2>
 
+
+{% if club.respos.exists %}
+<h3>Respo{{ club.respos.all|pluralize }}</h3>
+<table class="table table-striped">
+{% for member in club.respos.all %}
+  <tr>
+    <td>{{ member }}</td>
+    <td>{{ member.email }}</td>
+    <td><a class="glyphicon glyphicon-arrow-down"
+           href="{% url "change-respo" club.name member.id %}"></a></td>
+  </tr>
+{% endfor %}
+</table>
+{% else %}
+<h3>Pas de respo</h3>
+{% endif %}
+
+
 {% if club.membres.exists %}
 <h3>Liste des membres</h3>
 <table class="table table-striped">
-{% for member in club.membres.all %}
-    <tr>
-        <td>{{ member }}</td>
-	<td>{{ member.email }}</td>
-    </tr>
+{% for member in members_no_respo %}
+  <tr>
+    <td>{{ member }}</td>
+    <td>{{ member.email }}</td>
+    <td><a class="glyphicon glyphicon-arrow-up"
+           href="{% url "change-respo" club.name member.id %}"></a></td>
+  </tr>
 {% endfor %}
-</ul>
+</table>
 {% else %}
-Ce club ne contient actuellement aucun membre.
+Ce club ne comporte actuellement aucun membre.
 {% endif %}
 
 {% endblock %}
diff --git a/gestioncof/urls.py b/gestioncof/urls.py
index f0590b1e..ad108005 100644
--- a/gestioncof/urls.py
+++ b/gestioncof/urls.py
@@ -55,5 +55,7 @@ calendar_patterns = [
 
 clubs_patterns = [
     url(r'^membres/(?P<name>\w+)', views.membres_club, name='membres-club'),
-    url(r'^liste', views.liste_clubs, name='liste-clubs')
+    url(r'^liste', views.liste_clubs, name='liste-clubs'),
+    url(r'^change_respo/(?P<club_name>\w+)/(?P<user_id>\d+)',
+        views.change_respo, name='change-respo'),
 ]
diff --git a/gestioncof/views.py b/gestioncof/views.py
index c74c1da6..b3b69902 100644
--- a/gestioncof/views.py
+++ b/gestioncof/views.py
@@ -497,7 +497,23 @@ def membres_club(request, name):
     if not request.user.profile.is_buro \
             and club not in user.clubs_geres.all():
         return HttpResponseForbidden('<h1>Permission denied</h1>')
-    return render(request, 'membres_clubs.html', {'club': club})
+    members_no_respo = club.membres.exclude(clubs_geres=club).all()
+    return render(request, 'membres_clubs.html',
+                  {'club': club,
+                   'members_no_respo': members_no_respo})
+
+
+@buro_required
+def change_respo(request, club_name, user_id):
+    club = get_object_or_404(Club, name=club_name)
+    user = get_object_or_404(User, id=user_id)
+    if user in club.respos.all():
+        club.respos.remove(user)
+    elif user in club.membres.all():
+        club.respos.add(user)
+    else:
+        raise Http404
+    return redirect('membres-club', name=club_name)
 
 
 @cof_required