Univention Bugzilla – Attachment 7736 Details for
Bug 34956
Setting computer room: Traceback in new school
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
34956.patch (text/plain), 937 bytes, created by
Florian Best
on 2016-06-13 12:05:12 CEST
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Florian Best
Created:
2016-06-13 12:05:12 CEST
Size:
937 bytes
patch
obsolete
>diff --git a/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py b/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py >index 943bba6..312400e 100644 >--- a/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py >+++ b/ucs-school-umc-computerroom/umc/python/computerroom/__init__.py >@@ -361,8 +361,11 @@ class Instance(SchoolBaseModule): > def rooms(self, request, ldap_user_read=None): > """Returns a list of all available rooms""" > rooms = [] >- # create search base for current school >- for room in ComputerRoom.get_all(ldap_user_read, request.options['school']): >+ try: >+ all_rooms = ComputerRoom.get_all(ldap_user_read, request.options['school']) >+ except noObject: >+ all_rooms = [] >+ for room in all_rooms: > room_info = _readRoomInfo(room.dn) or dict() > user_dn = room_info.get('user') > locked = user_dn and user_dn != self._user_dn and ('pid' in room_info or 'exam' in room_info)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=7736">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 34956
: 7736