correction erreur ajout group/registration

mise en place du selected sur le changement de chambre pour eviter les evictions involontaires
This commit is contained in:
Romain Beuque 2014-06-09 13:23:46 +02:00
parent 29fb42b788
commit 7a25aa6cf5
2 changed files with 8 additions and 3 deletions

View File

@ -182,8 +182,10 @@ 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.administration_controller.groups.add_member.post(group_cn, member.dn, go_redirect = False)
self.member_edit_controller.cotisation.add.post(residence, member_uid, next_end, extra_name, go_redirect = False)
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)

View File

@ -27,7 +27,10 @@
<select name="room_uid">
<option value="">&lt;vide&gt;</option>
<py:for each="target_room in rooms">
<option value="${target_room.uid.first()}">${target_room.cn.first()}</option>
<py:choose test="target_room.uid.first()">
<option value="${target_room.uid.first()}" py:when="room_ldap.uid.first()" selected="selected">${target_room.cn.first()} (actuelle)</option>
<option value="${target_room.uid.first()}" py:otherwise="">${target_room.cn.first()}</option>
</py:choose>
</py:for>
</select>
<input type="hidden" name="residence" value="${residence}"/>