Changeset 9416

Timestamp:

25 Oct 2012, 11:41:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not allow that students can be removed from a bed by using the BedManageFormPage?.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/hostels

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• tests.py (modified) (1 diff)

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

@@ -360 +360 @@
     @action(_('Save'))
     def save(self, **data):
+        if data['owner'] == NOT_OCCUPIED:
+            self.flash(_('No valid student id.'))
+            self.redirect(self.url(self.context))
+            return
         msave(self, **data)
         self.redirect(self.url(self.context.__parent__, '@@manage')+'?tab2')

main/waeup.kofa/trunk/src/waeup/kofa/hostels/interfaces.py

@@ -236 +236 @@
     owner = schema.TextLine(
         title = _(u'Owner (Student)'),
+        description = _('Enter valid student id.'),
         required = True,
         default = u'',
@@ -251 +252 @@
         if not bed.owner in student_ids:
             raise Invalid(_(
-                "Either student does not exist or is not in accommodation session."))
+                "Either student does not exist or student "
+                "is not in accommodation session."))
         catalog = getUtility(ICatalog, name='beds_catalog')
         beds = catalog.searchResults(owner=(bed.owner,bed.owner))

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -315 +315 @@
         # Managers can manually allocate eligible students after cancellation
         self.browser.open(self.container_path + '/hall-1/hall-1_A_101_A')
+        # 'not occupied' is not accepted
+        self.browser.getControl("Save").click()
+        self.assertMatches(
+            "...No valid student id...",
+            self.browser.contents)
+        # Invalid student ids are not accepted
         self.browser.getControl(name="form.owner").value = 'nonsense'
         self.browser.getControl("Save").click()
         self.assertMatches(
-            "...Either student does not exist or is not in accommodation session...",
+            "...Either student does not exist or student "
+            "is not in accommodation session...",
             self.browser.contents)
         self.browser.getControl(name="form.owner").value = self.student_id