Changeset 15251

Timestamp:

23 Nov 2018, 11:18:45 (6 years ago)

Author:

Henrik Bettermann

Message:

Adjust components to changes made in r15250.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

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

@@ -37 +37 @@
 
     def test_release_expired_allocations(self):
-        config = grok.getSite()['configuration']
+        self.app['hostels'].allocation_expiration = 7
+        config = self.app['configuration']
         config.maintmode_enabled_by = u'any_user'
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -69 +70 @@
         logcontent = open(self.logfile).read()
         self.assertTrue(
-            'hostels.browser.CustomReleaseExpiredAllocationsPage - hostels - '
+            'hostels.browser.ReleaseExpiredAllocationsPage - hostels - '
             'released: hall_block_room_bed (B1000000)'
             in logcontent)

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

@@ -598 +598 @@
         'phone', 'adm_code', 'email', 'date_of_birth', 'flash_notice')
 
-    def render(self):
-        studentview = StudentBasePDFFormPage(self.context.student,
-            self.request, self.omit_fields)
-        students_utils = getUtility(IStudentsUtils)
-
-        note = """
-<br /><br /><br /><br /><br /><font size="14">
-Please endeavour to pay your hostel maintenance charge within <br /><br />
-7 days of being allocated a space or else you are deemed to have <br /><br />
-voluntarily forfeited it and it goes back into circulation to be <br /><br />
-available for booking afresh!</font>
-"""
-
-        return students_utils.renderPDF(
-            self, 'bed_allocation_slip.pdf',
-            self.context.student, studentview,
-            omit_fields=self.omit_fields,
-            note=note)
-
 class CustomPaymentsManageFormPage(PaymentsManageFormPage):
     """ Page to manage the student payments. This manage form page is for

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

@@ -973 +973 @@
 
     def test_student_accommodation(self):
+        self.app['hostels'].allocation_expiration = 7
         bed = Bed()
         bed.bed_id = u'hall-1_A_101_C'