From f40378a26ac5789b59a17e3821569d808afb2934 Mon Sep 17 00:00:00 2001 From: Roven Gabriel Date: Fri, 21 Feb 2014 23:21:49 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20du=20probl=C3=A8me=20de=20template?= =?UTF-8?q?=20sur=20recherche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Brie/brie/config/ldap_config.py | 2 +- Brie/brie/controllers/search.py | 7 +++--- Brie/brie/templates/search/member.html | 31 +++++++------------------- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/Brie/brie/config/ldap_config.py b/Brie/brie/config/ldap_config.py index 844134c..aadeaf1 100644 --- a/Brie/brie/config/ldap_config.py +++ b/Brie/brie/config/ldap_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -uri = "ldaps://172.17.31.4" +uri = "ldaps://localhost" username_base_dn = "ou=membres," room_base_dn = "ou=chambres," diff --git a/Brie/brie/controllers/search.py b/Brie/brie/controllers/search.py index 4faf67f..335419b 100644 --- a/Brie/brie/controllers/search.py +++ b/Brie/brie/controllers/search.py @@ -168,7 +168,6 @@ class SearchController(AuthenticatedBaseController): #end def - @expose("brie.templates.search.member_global") def member_global(self, myresidence, name): residences = Residences.get_residences(self.user) members = [] @@ -196,7 +195,8 @@ class SearchController(AuthenticatedBaseController): return { "residence" : myresidence, "user" : self.user, - "members_rooms" : members_rooms + "members_rooms" : members_rooms, + "type" : "global" } #end def @@ -228,7 +228,8 @@ class SearchController(AuthenticatedBaseController): return { "residence" : myresidence, "user" : self.user, - "members_rooms" : members_rooms + "members_rooms" : members_rooms, + "type" : "global" } #end def diff --git a/Brie/brie/templates/search/member.html b/Brie/brie/templates/search/member.html index 6c5fde6..a580e47 100644 --- a/Brie/brie/templates/search/member.html +++ b/Brie/brie/templates/search/member.html @@ -1,25 +1,10 @@ - - - - - - - - - - - - - - - - - - - -
membrechambre
${member.cn.first()}sdf${room.cn.first()}
- + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude" + py:strip=""> + + + + +