Changeset 8684

Timestamp:

12 Jun 2012, 05:22:54 (12 years ago)

Author:

Henrik Bettermann

Message:

Add 'Add applicant' action button.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• viewlets.py (modified) (2 diffs)

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

@@ -334 +334 @@
     form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
     taboneactions = [_('Save'),_('Cancel')]
-    tabtwoactions = [_('Add applicant'), _('Remove selected'),_('Cancel'),
+    tabtwoactions = [_('Remove selected'),_('Cancel'),
         _('Create students from selected')]
     tabthreeactions1 = [_('Remove selected local roles')]
@@ -422 +422 @@
                 mapping = {'a':', '.join(deleted)}))
         self.redirect(self.url(self.context, u'@@manage')+'?tab2')
-        return
-
-    @action(_('Add applicant'), validator=NullValidator)
-    def addApplicant(self, **data):
-        self.redirect(self.url(self.context, 'addapplicant'))
         return
 

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

@@ -399 +399 @@
         self.container_manage_path = self.container_path + '/@@manage'
         self.browser.open(self.container_manage_path)
-        self.browser.getControl("Add applicant").click()
+        self.browser.getLink("Add applicant").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.add_applicant_path)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -19 +19 @@
 from waeup.kofa.interfaces import IKofaObject
 from waeup.kofa.students.viewlets import PrimaryStudentNavTab
-from waeup.kofa.browser.viewlets import ManageActionButton, PrimaryNavTab
+from waeup.kofa.browser.viewlets import (
+    ManageActionButton, PrimaryNavTab, AddActionButton)
 from waeup.kofa.applicants.interfaces import (
     IApplicant, IApplicantsRoot, IApplicantsContainer,
@@ -107 +108 @@
     target = 'register'
 
+class ApplicantsContainerAddActionButton(AddActionButton):
+    grok.order(1)
+    grok.context(IApplicantsContainer)
+    grok.view(ApplicantsContainerManageFormPage)
+    grok.require('waeup.manageApplication')
+    text = _('Add applicant')
+    target = 'addapplicant'
+
 class ApplicantsContainerStatisticsActionButton(ManageActionButton):
-    grok.order(1)
+    grok.order(2)
     grok.context(IApplicantsContainer)
     grok.view(ApplicantsContainerManageFormPage)