yohan/brie-aurore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with Roven

Browse Source
This commit is contained in:
Romain Beuque 2014-02-23 13:46:22 +01:00
commit ac886f890c
4 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Brie/brie/config/ldap_config.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
uri = "ldaps://172.17.31.4" uri = "ldaps://localhost"
username_base_dn = "ou=membres," username_base_dn = "ou=membres,"
room_base_dn = "ou=chambres," room_base_dn = "ou=chambres,"

7
Brie/brie/controllers/search.py
View File

@ -168,7 +168,6 @@ class SearchController(AuthenticatedBaseController):
#end def #end def
@expose("brie.templates.search.member_global")
def member_global(self, myresidence, name): def member_global(self, myresidence, name):
residences = Residences.get_residences(self.user) residences = Residences.get_residences(self.user)
members = [] members = []
@ -196,7 +195,8 @@ class SearchController(AuthenticatedBaseController):
return { return {
"residence" : myresidence, "residence" : myresidence,
"user" : self.user, "user" : self.user,
"members_rooms" : members_rooms "members_rooms" : members_rooms,
"type" : "global"
} }
#end def #end def
@ -228,7 +228,8 @@ class SearchController(AuthenticatedBaseController):
return { return {
"residence" : myresidence, "residence" : myresidence,
"user" : self.user, "user" : self.user,
"members_rooms" : members_rooms "members_rooms" : members_rooms,
"type" : "global"
} }
#end def #end def

31
Brie/brie/templates/search/member.html
View File

@ -1,25 +1,10 @@
<html <html
xmlns:py="http://genshi.edgewall.org/" xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude"
<head> py:strip="">
<link type="text/css" rel="Stylesheet" href="/css/common.css" /> <py:choose test="defined('type') and type == 'global'">
<link type="text/css" rel="Stylesheet" href="/css/rooms.css" /> <xi:include py:when="True" href="member_global.html" />
<xi:include href="common-css-header.html" /> <xi:include py:when="False" href="member_local.html" />
</head> </py:choose>
<body>
<xi:include href="navbar.html" />
<table class="table table-hover">
<tr>
<th>membre</th>
<th>chambre</th>
</tr>
<tr py:for="member, room in members_rooms">
<td><a href="/show/member/${residence}/${member.uid.first()}">${member.cn.first()}</a></td>
<py:choose test="room">
<td py:when="None">sdf</td>
<td py:otherwise=""><a href="/show/room/${residence}/${room.uid.first()}">${room.cn.first()}</a></td>
</py:choose>
</tr>
</table>
</body>
</html> </html>

25
Brie/brie/templates/search/member_local.html Normal file
View File

@ -0,0 +1,25 @@
<html
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude">
<head>
<link type="text/css" rel="Stylesheet" href="/css/common.css" />
<link type="text/css" rel="Stylesheet" href="/css/rooms.css" />
<xi:include href="common-css-header.html" />
</head>
<body>
<xi:include href="navbar.html" />
<table class="table table-hover">
<tr>
<th>membre</th>
<th>chambre</th>
</tr>
<tr py:for="member, room in members_rooms">
<td><a href="/show/member/${residence}/${member.uid.first()}">${member.cn.first()}</a></td>
<py:choose test="room">
<td py:when="None">sdf</td>
<td py:otherwise=""><a href="/show/room/${residence}/${room.uid.first()}">${room.cn.first()}</a></td>
</py:choose>
</tr>
</table>
</body>
</html>