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

Timestamp:

21 Jun 2016, 04:46:56 (8 years ago)

Author:

Henrik Bettermann

Message:

Count mandates on configuration page and provide 'Purge' button.

Location:

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

Files:

• browser/pages.py (modified) (2 diffs)
• browser/templates/configurationmanagepage.pt (modified) (1 diff)
• mandates/container.py (modified) (1 diff)
• mandates/interfaces.py (modified) (1 diff)
• mandates/tests.py (modified) (2 diffs)

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

@@ -1049 +1049 @@
     pnav = 0
     label = _(u'Edit portal configuration')
-    taboneactions = [_('Save'), _('Update plugins')]
+    taboneactions = [_('Save'), _('Update plugins'), _('Purge mandates')]
     tabtwoactions = [
         _('Add session configuration'),
@@ -1100 +1100 @@
         grok.getSite().updatePlugins()
         self.flash(_('Plugins were updated. See log file for details.'))
+        return
+
+    @action(_('Purge mandates'),
+              tooltip=_('For experts only!'),
+              validator=NullValidator)
+    def purgeMandates(self, **data):
+        num = grok.getSite()['mandates'].removeExpired()
+        self.flash(_('${a} mandate(s) were purged.', mapping = {'a': num}))
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/configurationmanagepage.pt

@@ -16 +16 @@
         <tbody>
           <tal:widgets content="structure provider:widgets" />
+          <tr>
+            <td>Mandates:</td>
+            <td>
+              <span tal:content="python:layout.site['mandates'].count[0]"></span>
+              <span i18n:translate="">active</span>,
+              <span tal:content="python:layout.site['mandates'].count[0]"></span>
+              <span i18n:translate="">expired</span>,
+              <span tal:content="python:layout.site['mandates'].count[0]"></span>
+              <span i18n:translate="">total</span>
+            </td>
+          </tr>
         </tbody>
       </table>

main/waeup.kofa/trunk/src/waeup/kofa/mandates/container.py

@@ -30 +30 @@
     grok.implements(IMandatesContainer)
     grok.provides(IMandatesContainer)
+
+    @property
+    def count(self):
+        """Count active and expired mandates.
+        """
+        now = datetime.utcnow()
+        total = len(self)
+        expired = len([i for i in self.values() if i.expires < now])
+        active = total - expired
+        return active, expired, total
 
     def addMandate(self, mandate):

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

@@ -25 +25 @@
     """
 
+    count = Attribute('Count active and expired mandates.')
+
     def addMandate(mandate):
         """Add mandate.

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

@@ -153 +153 @@
         self.app['mandates'].addMandate(mandate2)
         self.assertEqual(len(self.app['mandates'].keys()), 2)
+        self.assertEqual(self.app['mandates'].count, (1, 1, 2))
         num_deleted = self.app['mandates'].removeExpired()
         self.assertEqual(num_deleted, 1)
@@ -158 +159 @@
         self.assertEqual(len(self.app['mandates'].keys()), 1)
         self.assertEqual([i for i in self.app['mandates'].keys()], [u'23456'])
+
+    def test_purge_mandates(self):
+        # mandate1 is an old mandate which just expired.
+        mandate1 = PasswordMandate(days=0)
+        self.app['mandates'].addMandate(mandate1)
+        # mandate2 is a new mandate with default time delta.
+        mandate2 = PasswordMandate(mandate_id='23456')
+        self.app['mandates'].addMandate(mandate2)
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open('http://localhost/app/configuration')
+        self.assertEqual(self.app['mandates'].count, (1, 1, 2))
+        self.assertTrue('<span>expired</span>' in self.browser.contents)
+        self.browser.getControl("Purge mandates").click()
+        self.assertTrue('1 mandate(s) were purged' in self.browser.contents)
+        self.assertEqual(self.app['mandates'].count, (1, 0, 1))
+        return
 
     def test_browser(self):