Changeset 7200 for main/waeup.sirp/trunk/src

Timestamp:

25 Nov 2011, 14:10:21 (13 years ago)

Author:

Henrik Bettermann

Message:

Use same naming convention as in students: manage instead of edit_full, ApplicantDisplayFormPage? intead of DisplayApplicant?, ...

Rename pagetemplates.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• browser.py (modified) (11 diffs)
• browser_templates/applicantdisplaypage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_display.pt)
• browser_templates/applicanteditpage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt)
• browser_templates/applicantloginpage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/loginapplicant.pt)
• tests/test_browser.py (modified) (4 diffs)

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

@@ -292 +292 @@
     text = 'Manage applicants container'
 
-class LoginApplicantActionButton(ManageActionButton):
+class ApplicantLoginActionButton(ManageActionButton):
     grok.order(2)
     grok.context(IApplicantsContainer)
@@ -394 +394 @@
         return del_local_roles(self,3,**data)
 
-class LoginApplicant(WAeUPPage):
+class ApplicantLoginPage(WAeUPPage):
     grok.context(IApplicantsContainer)
     grok.name('login')
@@ -509 +509 @@
             applicant.access_code = pin
             self.context[pin] = applicant
-        self.redirect(self.url(self.context[pin], 'edit_full'))
+        self.redirect(self.url(self.context[pin], 'manage'))
         return
 
@@ -555 +555 @@
     target = '/application_slip.pdf'
 
-class DisplayApplicant(WAeUPDisplayFormPage):
+class ApplicantDisplayFormPage(WAeUPDisplayFormPage):
     grok.context(IApplicant)
     grok.name('index')
     grok.require('waeup.viewApplication')
+    grok.template('applicantdisplaypage')
     form_fields = grok.AutoFields(IApplicant).omit(
         'locked').omit('course_admitted')
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = 'Applicant'
-    grok.template('form_display')
     pnav = 3
 
@@ -705 +705 @@
 class ApplicantManageActionButton(ManageActionButton):
     grok.context(IApplicant)
-    grok.view(DisplayApplicant)
+    grok.view(ApplicantDisplayFormPage)
     grok.require('waeup.manageApplication')
     text = 'Manage application record'
-    target = 'edit_full'
+    target = 'manage'
 
 
@@ -729 +729 @@
     return True
 
-class EditApplicantFull(WAeUPEditFormPage):
+class ApplicantManageFormPage(WAeUPEditFormPage):
     """A full edit view for applicant data.
     """
     grok.context(IApplicant)
-    grok.name('edit_full')
+    grok.name('manage')
     grok.require('waeup.manageApplication')
     form_fields = grok.AutoFields(IApplicant)
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
-    grok.template('form_edit')
+    grok.template('applicanteditpage')
     manage_applications = True
     pnav = 3
@@ -743 +743 @@
     def update(self):
         datepicker.need() # Enable jQuery datepicker in date fields.
-        super(EditApplicantFull, self).update()
+        super(ApplicantManageFormPage, self).update()
         self.wf_info = IWorkflowInfo(self.context)
         self.max_upload_size = string_from_bytes(MAX_UPLOAD_SIZE)
@@ -796 +796 @@
         return
 
-class EditApplicantStudent(EditApplicantFull):
+class ApplicantEditFormPage(ApplicantManageFormPage):
     """An applicant-centered edit view for applicant data.
     """
@@ -807 +807 @@
         )
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
-    grok.template('form_edit')
+    grok.template('applicanteditpage')
     manage_applications = False
     title = u'Your Application Form'
@@ -821 +821 @@
             return
         datepicker.need() # Enable jQuery datepicker in date fields.
-        super(EditApplicantStudent, self).update()
+        super(ApplicantEditFormPage, self).update()
         return
 
@@ -862 +862 @@
 class ApplicantViewActionButton(ManageActionButton):
     grok.context(IApplicant)
-    grok.view(EditApplicantFull)
+    grok.view(ApplicantManageFormPage)
     grok.require('waeup.manageApplication')
     icon = 'actionicon_view.png'

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

@@ -290 +290 @@
         self.applicant_path = 'http://localhost/app/applicants/app2009/%s' % self.pin_applicant
         self.applicant_view_path = self.applicant_path + '/index'
-        self.applicant_manage_path = self.applicant_path + '/edit_full'
+        self.applicant_manage_path = self.applicant_path + '/manage'
         self.applicant_slip_path = self.applicant_path + '/application_slip.pdf'
         self.browser.open(self.applicant_manage_path)
@@ -603 +603 @@
         self.edit_path = 'http://localhost/app/applicants/app2009/%s/edit' % (
             self.pin)
-        self.edit_full_path = 'http://localhost/app/applicants/%s/%s/%s' % (
-            'app2009', self.pin, 'edit_full')
+        self.manage_path = 'http://localhost/app/applicants/%s/%s/%s' % (
+            'app2009', self.pin, 'manage')
 
     def tearDown(self):
@@ -773 +773 @@
         # Now go on as an officer
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.edit_full_path)
+        self.browser.open(self.manage_path)
 
         # Create a pseudo image file and select it to be uploaded in form
@@ -848 +848 @@
         # Login as manager and lock the form
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.edit_full_path)
+        self.browser.open(self.manage_path)
         self.browser.getControl(name="form.locked").value = True
         self.browser.getControl("Save").click()