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

ajout d'un groupe pendant l'inscription d'un membre

Browse Source
This commit is contained in:
Romain Beuque 2014-06-09 12:02:06 +02:00
parent ebb3dcbead
commit 29fb42b788
4 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Brie/brie/controllers/administration.py
View File

@ -18,7 +18,7 @@ from operator import itemgetter
class GroupAddMemberController(AuthenticatedRestController):
@expose()
def post(self, group_cn, user_dn):
def post(self, group_cn, user_dn, go_redirect = True):
groups_of_user = Groupes.get_by_user_dn(self.user, self.user.residence_dn, user_dn)
if group_cn in groups_of_user:
@ -34,7 +34,9 @@ class GroupAddMemberController(AuthenticatedRestController):
attr = Groupes.unique_member_attr(user_dn)
self.user.ldap_bind.add_attr(target_group.dn, attr)
redirect("/administration/")
if go_redirect:
redirect("/administration/")
#end if
#end def
#end class

40
Brie/brie/controllers/registration.py
View File

@ -23,13 +23,15 @@ class RegistrationController(AuthenticatedBaseController):
require_group = groups_enum.admin
member_edit_controller = None
administration_controller = None
quick_last_registrations = dict()
def __init__(self, member_edit_controller):
self.new = NewRegistrationController(member_edit_controller)
def __init__(self, member_edit_controller, administration_controller):
self.new = NewRegistrationController(member_edit_controller, administration_controller)
self.recover = ErrorRecoveryRegistrationController(member_edit_controller)
self.member_edit_controller = member_edit_controller
self.administration_controller = administration_controller
#end def
@expose("brie.templates.registration.index")
@ -97,13 +99,16 @@ class RegistrationController(AuthenticatedBaseController):
quick_last = []
#end if
groupes = Groupes.get_all(self.user, self.user.residence_dn)
return {
"user" : self.user,
"residence" : residence,
"rooms" : rooms,
"quick_last" : quick_last,
"available_months_prices" : available_months_prices,
"extras_available" : extras_available
"extras_available" : extras_available,
"groupes" : groupes
}
#end class
@ -135,25 +140,33 @@ class NewRegistrationController(AuthenticatedRestController):
require_group = groups_enum.admin
member_edit_controller = None
administration_controller = None
def __init__(self, member_edit_controller):
def __init__(self, member_edit_controller, administration_controller):
self.member_edit_controller = member_edit_controller
self.administration_controller = administration_controller
@expose()
def post(self, residence, sn, givenName, mail, phone,
room_uid, first_machine_name, first_machine_mac,
next_end, extra_name
next_end, extra_name, group_cn
):
# Initialisation des Users des Controllers Existant appellés
self.member_edit_controller.add.user = self.user
self.member_edit_controller.machine.add.user = self.user
self.member_edit_controller.room.move.user = self.user
self.member_edit_controller.cotisation.add.user = self.user
self.administration_controller.groups.add_member.user = self.user
if phone == '':
phone = ' '
#end if
# On ne permet pas a des simples aides membres d'ajouter a des groupes
if group_cn != "" and groups_enum.responsablereseau not in self.user.groups.list():
group_cn = ""
#end if
member_uid = self.member_edit_controller.add.post(residence, givenName, sn, mail, phone, go_redirect = False)
member = Member.get_by_uid(self.user, self.user.residence_dn, member_uid)
@ -169,8 +182,8 @@ class NewRegistrationController(AuthenticatedRestController):
#end if
try:
self.member_edit_controller.machine.add.post(residence, member_uid, first_machine_name, first_machine_mac, go_redirect = False)
self.member_edit_controller.cotisation.add.post(residence, member_uid, next_end, extra_name, go_redirect = False)
self.member_edit_controller.cotisation.add.post(residence, member_uid, next_end, extra_name, go_redirect = False)
self.administration_controller.groups.add_member.post(group_cn, member.dn, go_redirect = False)
except:
redirect("/registration/error/" + member_uid)
@ -190,7 +203,7 @@ class ErrorRecoveryRegistrationController(AuthenticatedRestController):
@expose()
def post(self, residence, member_uid, room_uid,
first_machine_name, first_machine_mac,
next_end, extra_name):
next_end, extra_name, group_cn):
member = Member.get_by_uid(self.user, self.user.residence_dn, member_uid)
if member is None:
@ -211,7 +224,16 @@ class ErrorRecoveryRegistrationController(AuthenticatedRestController):
if next_end != "":
self.member_edit_controller.cotisation.add.post(residence, member_uid, next_end, extra_name, go_redirect = False)
self.member_edit_controller.cotisation.add.post(residence, member_uid, next_end, extra_name, go_redirect = False)
# On ne permet pas a des simples aides membres d'ajouter a des groupes
if group_cn != "" and groups_enum.responsablereseau not in self.user.groups.list():
group_cn = ""
#end if
if group_cn != "":
self.administration_controller.groups.add_member.post(group_cn, member.dn, go_redirect = False)
#end if
except:
redirect("/registration/error/" + member_uid)
#end try

4
Brie/brie/controllers/root.py
View File

@ -27,6 +27,7 @@ from brie.controllers.error import ErrorController
from brie.controllers.registration import RegistrationController
from brie.controllers.treasury import TreasuryController
from brie.controllers.plugins import PluginsController
from brie.controllers.groups import GroupsController
__all__ = ['RootController']
@ -58,9 +59,10 @@ class RootController(BaseController):
getemails = GetEmailsController()
error = ErrorController()
search = SearchController()
registration = RegistrationController(edit)
registration = RegistrationController(edit, administration)
treasury = TreasuryController()
plugins = PluginsController()
groups = GroupsController()
@expose('brie.templates.index')
def index(self):

11
Brie/brie/templates/registration/index.html
View File

@ -57,6 +57,17 @@
<span class="section_name show_section_name">COTISATION</span>
<xi:include href="../edit/cotisation-edit.html" />
</div>
<div class="section">
<div>
<span class="item_name">ajouter a un groupe // RESPONSABLE RESEAU UNIQUEMENT</span>
<select name="group_cn">
<option value="">---</option>
<option py:for="group in groupes" value="${group.cn.first()}">
${group.cn.first()}
</option>
</select>
</div>
</div>
<div class="section">
<div>
<div>