From 8887eaf48cfc4d02213f2efee59fdcd5426d6f06 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 10 Jul 2016 04:14:47 +0200
Subject: [PATCH] Collision entre request_user et user

---
 re2o/context_processors.py | 17 +++++++++++++++++
 templates/base.html        | 12 ++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 re2o/context_processors.py

diff --git a/re2o/context_processors.py b/re2o/context_processors.py
new file mode 100644
index 00000000..d4de21b8
--- /dev/null
+++ b/re2o/context_processors.py
@@ -0,0 +1,17 @@
+
+
+def context_user(request):
+    user = request.user
+    is_cableur = user.has_perms(('cableur',))
+    is_bureau = user.has_perms(('bureau',))
+    is_bofh = user.has_perms(('bofh',))
+    is_trez = user.has_perms(('trésorier',))
+    is_infra = user.has_perms(('infra',))
+    return {
+        'request_user': user,
+        'is_cableur': is_cableur,
+        'is_bureau': is_bureau,
+        'is_bofh': is_bofh,
+        'is_trez': is_trez,
+        'is_infra': is_infra,
+    }
diff --git a/templates/base.html b/templates/base.html
index e482c550..5189bc3a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,12 +85,12 @@
                     </div>
                     <div class="col-sm-2 sidenav">
                         <div class="well">
-                            {% if user.is_authenticated %}
-                            <li>{{ user.name }} {{ user.surname }}</li>
-                            <li>Pseudo : {{ user.pseudo }}</li>
-                            <li>Chambre : {{ user.room }}</li>
-                            <li>Connexion : {% if user.actif == True %}<font color="green">Active</font>{% else %}<font color="red">Désactivée</font>{% endif %}</li>
-                            <li>Fin d'adhésion : {% if user.end_adhesion != None %}<font color="green">{{ user.end_adhesion }}</font>{% else %}<font color="red">Non adhérent</font>{% endif %}</li>
+                            {% if request_user.is_authenticated %}
+                            <li>{{ request_user.name }} {{ request_user.surname }}</li>
+                            <li>Pseudo : {{ request_user.pseudo }}</li>
+                            <li>Chambre : {{ request_user.room }}</li>
+                            <li>Connexion : {% if request_user.actif == True %}<font color="green">Active</font>{% else %}<font color="red">Désactivée</font>{% endif %}</li>
+                            <li>Fin d'adhésion : {% if request_user.end_adhesion != None %}<font color="green">{{ user.end_adhesion }}</font>{% else %}<font color="red">Non adhérent</font>{% endif %}</li>
                             <p><a href="{% url "users:mon-profil" %}">Voir mon profil</a></p>
                             {% else %}
                             <p>Vous n'êtes pas authentifié</p>