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

correction bug

Browse Source
This commit is contained in:
Roven Gabriel 2013-09-11 22:24:55 +02:00
parent 66e808f40f
commit abb643bdbe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Brie/brie/controllers/edit.py
View File

@ -235,7 +235,7 @@ class MachineAddController(AuthenticatedRestController):
def post(self, residence, member_uid, name, mac, go_redirect = True, plugin_action = None): def post(self, residence, member_uid, name, mac, go_redirect = True, plugin_action = None):
residence_dn = Residences.get_dn_by_name(self.user, residence) residence_dn = Residences.get_dn_by_name(self.user, residence)
member_base_dn = ldap_config.username_base_dn + residence_dn member_base_dn = ldap_config.username_base_dn + residence_dn
member = Member.get_by_uid(self.user, member_base_dn, member_uid) member = Member.get_by_uid(self.user, residence_dn, member_uid)
#Vérification que l'adresse mac soit correcte #Vérification que l'adresse mac soit correcte
mac_match = re.match('^([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})$', mac) mac_match = re.match('^([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})$', mac)

4
Brie/brie/model/ldap.py
View File

@ -30,8 +30,8 @@ class Member(object):
#end def #end def
@staticmethod @staticmethod
def get_by_uid(user_session, member_base_dn, uid): def get_by_uid(user_session, residence_dn, uid):
return user_session.ldap_bind.search_first(member_base_dn, "(uid=" + uid + ")") return user_session.ldap_bind.search_first(ldap_config.username_base_dn + residence_dn, "(uid=" + uid + ")")
#end def #end def
@staticmethod @staticmethod