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

Système de déconnexion/reconnexion globale pour les AGs fonctionnel. Nouveau groupe pour les membres exemptés de déconnexion globale.

Browse Source
This commit is contained in:
Yohan Bataille 2014-01-29 20:29:34 +01:00
parent 943742ed54
commit 67cd42b6bf
3 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Brie/brie/config/groups_enum.py
View File

@ -5,3 +5,4 @@ admin = "admin"
membreca = "membreca"
tresorier = "tresorier"
respsalleinfo = "respsalleinfo"
exemptdecoglobale = "exemptdecoglobale"

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

@ -113,6 +113,8 @@ class MemberModificationController(AuthenticatedRestController):
self.show = new_show
self.disable = MemberDisableController()
self.enable = MemberEnableController()
self.disconnectall = AllMembersDisableController()
self.reconnectall = AllMembersEnableController()
#end def
""" Affiche les détails éditables du membre et de la chambre """
@ -793,13 +795,12 @@ class RoomChangeMemberController(AuthenticatedRestController):
#end def
#end def
# TODO :
""" Controller REST de gestion de la deconnexion globale. """
class AllMembersDisableController(AuthenticatedRestController):
require_group = groups_enum.admin
""" Gestion des requêtes post sur ce controller """
@expose()
@expose("brie.templates.index")
def post(self, residence):
residence_dn = Residences.get_dn_by_name(self.user, residence)
@ -807,56 +808,61 @@ class AllMembersDisableController(AuthenticatedRestController):
# Note : on cherche la machine seulement sur le membre (member.dn)
members = Member.get_all(self.user, residence_dn)
for member in members:
member = Member.get_by_uid(self.user, residence_dn, member_uid)
if member is None:
raise Exception('membre inconnu')
#end if
groups_of_user = Groupes.get_by_user_dn(self.user, residence_dn, member.dn)
if "exemptdecoglobale" not in groups_of_user:
dhcps = Machine.get_dhcps(self.user, member.dn)
machine_membre_tag = "machine_membre" # FIXME move to config
dhcps = Machine.get_dhcps(self.user, member.dn)
machine_membre_tag = "machine_membre" # FIXME move to config
for dhcp_item in dhcps:
if dhcp_item.uid.first() == machine_membre_tag:
dhcp_item.uid.replace(machine_membre_tag, machine_membre_tag + "_disabled")
self.user.ldap_bind.save(dhcp_item)
#end if
#end for
#end if
#end for
for dhcp_item in dhcps:
if dhcp_item.uid.first() == machine_membre_tag:
dhcp_item.uid.replace(machine_membre_tag, machine_membre_tag + "_disabled")
self.user.ldap_bind.save(dhcp_item)
#end if
#end for
# On redirige sur la page d'édition du membre
redirect("/edit/member/" + residence + "/" + member_uid)
# On redirige sur la page d'accueil
redirect("/")
#end def
# TODO :
""" Controller REST de gestion de la reconnexion globale. """
class AllMembersEnableController(AuthenticatedRestController):
require_group = groups_enum.admin
""" Gestion des requêtes post sur ce controller """
@expose()
@expose("brie.templates.index")
def post(self, residence):
residence_dn = Residences.get_dn_by_name(self.user, residence)
# Récupération du membre et de la machine
# Note : on cherche la machine seulement sur le membre (member.dn)
member = Member.get_by_uid(self.user, residence_dn, member_uid)
if member is None:
raise Exception('membre inconnu')
#end if
members = Member.get_all(self.user, residence_dn)
for member in members:
if member is None:
raise Exception('membre inconnu')
#end if
# On ne reconnecte que les membres ayant payé leur cotisation.
if CotisationComputes.is_cotisation_paid(member, self.user, residence_dn):
dhcps = Machine.get_dhcps(self.user, member.dn)
machine_membre_tag = "machine_membre" # FIXME move to config
machine_membre_disabled = machine_membre_tag + "_disabled" # FIXME move to config
dhcps = Machine.get_dhcps(self.user, member.dn)
machine_membre_tag = "machine_membre" # FIXME move to config
machine_membre_disabled = machine_membre_tag + "_disabled" # FIXME move to config
for dhcp_item in dhcps:
if dhcp_item.uid.first() == machine_membre_disabled:
dhcp_item.uid.replace(machine_membre_disabled, machine_membre_tag)
self.user.ldap_bind.save(dhcp_item)
for dhcp_item in dhcps:
if dhcp_item.uid.first() == machine_membre_disabled:
dhcp_item.uid.replace(machine_membre_disabled, machine_membre_tag)
self.user.ldap_bind.save(dhcp_item)
#end if
#end for
#end if
#end for
# On redirige sur la page d'édition du membre
redirect("/edit/member/" + residence + "/" + member_uid)
# On redirige sur la page d'accueil
redirect("/")
#end def

7
Brie/brie/templates/index.html
View File

@ -37,12 +37,15 @@
<input type="submit" value="Search" class="button"/>
</form>
</div>
<!-- Ne fonctionne pas encore : -->
<div class="section">
<form action="/disconnectall/" method="post" class="inline_block">
<form action="/edit/member/disconnectall/" method="post" class="inline_block">
<input type="hidden" name="residence" value="${residence}"/>
<input type="submit" value="Déconnexion globale" class="button"/>
</form>
<form action="/edit/member/reconnectall/" method="post" class="inline_block">
<input type="hidden" name="residence" value="${residence}"/>
<input type="submit" value="Reconnexion globale" class="button"/>
</form>
</div>
</div>
</body>