Changeset 9424 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

26 Oct 2012, 17:17:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Fix docstrings.

In my old ZODB which I used for testing there were orphaned catalog entries. I don't know why. The tests show clearly that the catalog is updated whenever a hostel is removed or cleared. However, to be 100% that nothing goes wrong I added some extra safety belts.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1342 +1342 @@
             current_session = str(student['studycourse'].current_session)
             if not student['accommodation'].has_key(current_session):
-                self.flash(_('You have not yet booked a bed.'))
+                self.flash(_('You have not yet booked accommodation.'))
                 self.redirect(self.url(self.context))
                 return
@@ -1589 +1589 @@
             # If bed space has been manually allocated use this bed
             bed = [entry for entry in entries][0]
+            # Safety belt for paranoids: Does this bed really exist on portal?
+            # XXX: Can be remove if nobody complains.
+            if bed.__parent__.__parent__ is None:
+                self.flash(_('System error: Please contact the adminsitrator.'))
+                return
         else:
             # else search for other available beds
@@ -1598 +1603 @@
                 students_utils = getUtility(IStudentsUtils)
                 bed = students_utils.selectBed(available_beds)
+                # Safety belt for paranoids: Does this bed really exist in portal?
+                # XXX: Can be remove if nobody complains.
+                if bed.__parent__.__parent__ is None:
+                    self.flash(_('System error: Please contact the adminsitrator.'))
+                    return
                 bed.bookBed(student.student_id)
             else: