From b9b325d6fc09073c637216844fb15e3610a050c4 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 29 Feb 2016 00:07:06 +0100 Subject: [PATCH] =?UTF-8?q?Afficher=20bureau=20et=20num=C3=A9ro=20de=20t?= =?UTF-8?q?=C3=A9l=C3=A9phone=20du=20valideur=20en=20page=20de=20d=C3=A9ta?= =?UTF-8?q?il=20(fixes=20#9981)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- polynum/base/models/user.py | 3 ++- polynum/request/templates/request_detail.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/polynum/base/models/user.py b/polynum/base/models/user.py index 536c7ec..ddb649c 100644 --- a/polynum/base/models/user.py +++ b/polynum/base/models/user.py @@ -10,7 +10,8 @@ from django.utils.translation import ugettext_lazy as _ class PolynumUser(AuthUser): def get_ldap_attributes(self): - return {} + from polynum.base.backends import CASBackend + return CASBackend().get_ldap_attributes(self) def display_name(self): name = self.get_full_name().strip() diff --git a/polynum/request/templates/request_detail.html b/polynum/request/templates/request_detail.html index ab68587..9c3e9ce 100644 --- a/polynum/request/templates/request_detail.html +++ b/polynum/request/templates/request_detail.html @@ -19,7 +19,7 @@ {% include "detail_template.html" with value=poly_request.request_number name="Demande n°" %} {% if poly_request.history_set.last_show_in_details %} -

Valideur: {{ poly_request.history_set.last_show_in_details.user.get_full_name }}

+

Valideur: {% with validateur=poly_request.history_set.last_show_in_details.user %}{{ validateur.get_full_name }} ({{ validateur.get_ldap_attributes.roomNumb {% endif %} {% if poly_request.sponsor_username == poly_request.user.username %} {% include "detail_template.html" with value=poly_request.user.display_name name="Utilisateur & Commanditaire" %}