Changeset 7006

Timestamp:

6 Nov 2011, 10:11:44 (13 years ago)

Author:

Henrik Bettermann

Message:

Add missing handler.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• hostels/catalog.py (modified) (1 diff)
• hostels/hostel.py (modified) (2 diffs)
• students/browser.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/catalog.py

@@ -17 +17 @@
     grok.context(IBed)
 
-    bed_number = index.Field(attribute='bed_number')
+    #bed_id = index.Field(attribute='bed_id')
+    #bed_number = index.Field(attribute='bed_number')
     bed_type = index.Field(attribute='bed_type')
     owner = index.Field(attribute='owner')

main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py

@@ -23 +23 @@
 from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.hostels.interfaces import IHostel, IBed
+from waeup.sirp.students.interfaces import IBedTicket
 
 NOT_OCCUPIED = u'not occupied'
@@ -181 +182 @@
 
 Bed = attrs_to_fields(Bed)
+
+@grok.subscribe(IBedTicket, grok.IObjectRemovedEvent)
+def handle_bedticket_removed(bedticket, event):
+    """If a bed ticket is deleted, we make sure that also the owner attribute
+    of the bed is cleared (set to NOT_OCCUPIED).
+    """
+    allocated_bed = bedticket.bed
+    allocated_bed.owner = NOT_OCCUPIED
+    notify(grok.ObjectModifiedEvent(allocated_bed))

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

@@ -16 +16 @@
 """UI components for students and related components.
 """
+import sys
 import grok
 from time import time
@@ -1154 +1155 @@
         bed = selectBed(available_beds)
         bed.bookBed(student.student_id)
-        bedticket.bed = bed # maybe wo don't need the bed object itself and can
-                            # remove that later
+        bedticket.bed = bed
         hall_title = bed.__parent__.hostel_name
         coordinates = bed.getBedCoordinates()[1:]

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -888 +888 @@
         ctrl.getControl(value=value).selected = True
         self.browser.getControl("Remove selected", index=0).click()
-        self.assertTrue('Successfully removed' in self.browser.contents)
+        self.assertMatches('...Successfully removed...', self.browser.contents)
         # Due to an event handler also the bed has been released properly
         bed = self.app['hostels']['hall-1']['hall-1_A_101_A']