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

Timestamp:

16 Dec 2011, 06:38:11 (13 years ago)

Author:

Henrik Bettermann

Message:

Replace middlenames by middlename.

Location:

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

Files:

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

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

@@ -71 +71 @@
     @property
     def fullname(self):
-        # We do not necessarily have the middlenames attribute
-        middlenames = getattr(self, 'middlenames', None)
-        if middlenames:
+        # We do not necessarily have the middlename attribute
+        middlename = getattr(self, 'middlename', None)
+        if middlename:
             return '%s %s %s' % (self.firstname,
-                middlenames, self.lastname)
+                middlename, self.lastname)
         else:
             return '%s %s' % (self.firstname, self.lastname)
@@ -102 +102 @@
         # Fire transition 'create'
         IWorkflowInfo(self).fireTransition('create')
-
-        # TODO: Split fullname in students package and copy first,
-        # middle and lastname
-
         # Copy some base data
-        student.fullname = self.fullname
+        student.firstname = self.firstname
+        student.lastname = self.lastname
         student.sex = self.sex
         student.date_of_birth = self.date_of_birth

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

@@ -413 +413 @@
     #grok.template('applicantaddpage')
     form_fields = grok.AutoFields(IApplicant).select(
-        'firstname', 'middlenames', 'lastname',
+        'firstname', 'middlename', 'lastname',
         'email', 'phone')
     title = 'Applicants'

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

@@ -309 +309 @@
         required = True,
         )
-    middlenames = schema.TextLine(
-        title = u'Middle Names',
+    middlename = schema.TextLine(
+        title = u'Middle Name',
         required = False,
         )

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

@@ -289 +289 @@
         self.assertEqual(self.browser.url, self.add_applicant_path)
         self.browser.getControl(name="form.firstname").value = 'Alois'
-        self.browser.getControl(name="form.middlenames").value = 'Kofi'
+        self.browser.getControl(name="form.middlename").value = 'Kofi'
         self.browser.getControl(name="form.lastname").value = 'Bettermann'
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'