Changeset 13050

Timestamp:

15 Jun 2015, 14:35:38 (9 years ago)

Author:

Henrik Bettermann

Message:

Clear already booked bed if student used an ac twice or isn't the owner of the ac. I found this bug when writing the documentation.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• tests/test_browser.py (modified) (3 diffs)

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

@@ -2046 +2046 @@
         if len(entries):
             # If bed space has been manually allocated use this bed
+            manual = True
             bed = [entry for entry in entries][0]
             # Safety belt for paranoids: Does this bed really exist on portal?
@@ -2057 +2058 @@
         else:
             # else search for other available beds
+            manual = False
             entries = cat.searchResults(
                 bed_type=(acc_details['bt'],acc_details['bt']))
@@ -2084 +2086 @@
                 self.flash(_('Activation code has already been used.'),
                            type="warning")
+                if not manual:
+                    # Release the previously booked bed
+                    bed.owner = NOT_OCCUPIED
+                    # Catalog must be informed
+                    notify(grok.ObjectModifiedEvent(bed))
                 return
             else:
@@ -2089 +2096 @@
                 # Here we know that the ac is in state initialized so we do not
                 # expect an exception, but the owner might be different
-                if not invalidate_accesscode(
-                    pin,comment,self.context.student.student_id):
+                success = invalidate_accesscode(
+                    pin, comment, self.context.student.student_id)
+                if not success:
                     self.flash(_('You are not the owner of this access code.'),
                                type="warning")
+                    if not manual:
+                        # Release the previously booked bed
+                        bed.owner = NOT_OCCUPIED
+                        # Catalog must be informed
+                        notify(grok.ObjectModifiedEvent(bed))
                     return
         # Create bed ticket

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

@@ -3006 +3006 @@
         self.assertMatches('...Activation Code:...',
                            self.browser.contents)
-        # Student can't used faked ACs ...
+        # Student can't use faked ACs ...
         self.browser.getControl(name="ac_series").value = u'nonsense'
         self.browser.getControl(name="ac_number").value = sfenumber
@@ -3019 +3019 @@
         self.assertMatches('...You are not the owner of this access code...',
                            self.browser.contents)
+        # The bed remains empty
+        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        self.assertTrue(bed.owner == NOT_OCCUPIED)
         ac.owner = self.student_id
         self.browser.getControl(name="ac_series").value = sfeseries
@@ -3026 +3029 @@
                            self.browser.contents)
         # Bed has been allocated
-        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
         self.assertTrue(bed.owner == self.student_id)
         # BedTicketAddPage is now blocked