Changeset 13529 for main/waeup.kofa/trunk/src/waeup

Timestamp:

2 Dec 2015, 20:15:36 (9 years ago)

Author:

Henrik Bettermann

Message:

Require maintenance mode for bed updates and expired bed allocation releases.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests.py (modified) (3 diffs)

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

@@ -192 +192 @@
 
     def update(self, n=7):
+        if not grok.getSite()['configuration'].maintmode_enabled_by:
+            self.flash(
+                _('Portal must be in maintenance mode for releasing expired '
+                  'bed allocations.'),
+                type='danger')
+            self.redirect(self.url(self.context))
+            return
         released = self.context.releaseExpiredAllocations(n)
         if len(released):
             message = ', '.join(released)
             self.context.writeLogMessage(self, 'released: %s' % message)
-            flash_msg = _('Successfully released beds: ${a}', mapping = {'a':message})
+            flash_msg = _('Successfully released beds: ${a}',
+                mapping = {'a':message})
         else:
             flash_msg = _('No bed released.')
@@ -296 +304 @@
                         ' You really want to update?'))
     def updateBeds(self, **data):
+        if not grok.getSite()['configuration'].maintmode_enabled_by:
+            self.flash(
+                _('Portal must be in maintenance mode for bed updates.'),
+                type='danger')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
+            return
         removed, added, modified, modified_beds = self.context.updateBeds()
         message = '%d empty beds removed, %d beds added, %d occupied beds modified (%s)' % (

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

@@ -201 +201 @@
         self.assertEqual(len(results), 1)
         self.browser.open(self.container_path + '/releaseexpired')
+        self.assertTrue('Portal must be in maintenance mode for releasing expired bed allocations'
+            in self.browser.contents)
+        grok.getSite()['configuration'].maintmode_enabled_by = u'any_id'
+        self.browser.open(self.container_path + '/releaseexpired')
         self.assertTrue('No bed released' in self.browser.contents)
         delta = timedelta(days=10)
@@ -339 +343 @@
         hall.beds_for_final = ['C']
         hall.beds_for_all = ['D','E']
+        self.browser.getControl("Update all beds").click()
+        self.assertTrue('Portal must be in maintenance mode for bed updates'
+            in self.browser.contents)
+        grok.getSite()['configuration'].maintmode_enabled_by = u'any_id'
         self.browser.getControl("Update all beds").click()
         expected = '...0 empty beds removed, 10 beds added, 0 occupied beds modified ()...'
@@ -507 +515 @@
 
     def test_clear_hostels(self):
+        grok.getSite()['configuration'].maintmode_enabled_by = u'any_id'
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.container_path)