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

Timestamp:

3 Jul 2012, 21:07:34 (12 years ago)

Author:

Henrik Bettermann

Message:

Add personal manage form page including button viewlet.

Location:

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

Files:

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

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

@@ -557 +557 @@
             mapping = {'a':self.context.display_fullname})
 
-class StudentPersonalEditFormPage(KofaEditFormPage):
-    """ Page to edit personal data
+class StudentPersonalManageFormPage(KofaEditFormPage):
+    """ Page to manage personal data
     """
     grok.context(IStudent)
-    grok.name('edit_personal')
-    grok.require('waeup.handleStudent')
+    grok.name('manage_personal')
+    grok.require('waeup.manageStudent')
     form_fields = grok.AutoFields(IStudentPersonal)
-    label = _('Edit personal data')
+    label = _('Manage personal data')
     pnav = 4
 
@@ -571 +571 @@
         msave(self, **data)
         return
+
+class StudentPersonalEditFormPage(StudentPersonalManageFormPage):
+    """ Page to edit personal data
+    """
+    grok.name('edit_personal')
+    grok.require('waeup.handleStudent')
+    label = _('Edit personal data')
+    pnav = 4
 
 class StudyCourseDisplayFormPage(KofaDisplayFormPage):

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

@@ -118 +118 @@
         self.manage_clearance_path = self.student_path + '/manage_clearance'
         self.edit_personal_path = self.student_path + '/edit_personal'
+        self.manage_personal_path = self.student_path + '/manage_personal'
         self.studycourse_path = self.student_path + '/studycourse'
         self.payments_path = self.student_path + '/payments'
@@ -454 +455 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.personal_path)
+        self.browser.getLink("Manage").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.manage_personal_path)
+        self.browser.open(self.personal_path)
         self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')

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

@@ -231 +231 @@
     target = 'view_personal'
 
+class StudentPersonalManageActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentPersonalDisplayFormPage)
+    grok.require('waeup.manageStudent')
+    text = _('Manage')
+    target = 'manage_personal'
+
 class StudentPersonalEditActionButton(ManageActionButton):
-    grok.order(1)
+    grok.order(2)
     grok.context(IStudent)
     grok.view(StudentPersonalDisplayFormPage)
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleStudent')
     text = _('Edit')
     target = 'edit_personal'