demenagement vers la même résidence impossible + vérification que l'uid n'est pas déjà pris + reparation de la recherche par email

Brie/brie/controllers/members.py

@@ -8,6 +8,7 @@ from brie.config import groups_enum
 from brie.lib.ldap_helper import *
 from brie.lib.aurore_helper import *
 from brie.model.ldap import *
+from brie.lib.name_translation_helpers import Translations
 
 from datetime import datetime
 
@@ -105,7 +106,16 @@ class MembersController(AuthenticatedBaseController):
 		#if member.has('mobile'):
 		#	phone = member.mobile.first()
 		#member_uid = self.member_edit_controller.add.post(residence_name, member.givenName.first(), member.sn.first(), member.mail.first(), phone, False)
-		
+                
+                member = Member.get_by_dn(self.user, member_dn)
+                member_uid = member.uid.first()
+                number = 1
+                while member is not None:
+		    member_dn = "uid=" + member_uid + number + ",ou=" + str(registration_year) + "," + ldap_config.username_base_dn + residence_dn
+                    number = number + 1
+                    member = Member.get_by_dn(self.user, member_dn)
+                #end while
+ 
 		self.user.ldap_bind.clone_entry(member_dn, member)
 		member = Member.get_by_uid(self.user, self.user.residence_dn, member.uid.first())
 

Brie/brie/controllers/search.py

@@ -60,9 +60,9 @@ class SearchController(AuthenticatedBaseController):
     @expose("brie.templates.search.member")
     def email(self, residence, email, global_search = None):
         if global_search is not None and self.user.groups.admin:
-            self.email_global(residence, email)
+            return self.email_global(residence, email)
         else:
-            self.email_local(residence, email)
+            return self.email_local(residence, email)
         #end if
     #end def
 

Brie/brie/templates/search/member_global.html

@@ -23,7 +23,7 @@
                     <td py:otherwise=""><a href="/show/room/${mresidence}/${room.uid.first()}">${room.cn.first()}</a></td>
                 </py:choose>
                 <td>
-                    <form action="/members/demenageResidence/" style="margin-bottom:0px" method="post" class="inline_block">
+                    <form action="/members/demenageResidence/" style="margin-bottom:0px" method="post" class="inline_block" py:if="mresidence != residence">
                         <input type="hidden" name="member_dn" value="${member.dn}"/>
                         <input type="submit" value="Move" class="button"/>
                     </form>