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

Timestamp:

16 Dec 2011, 07:32:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement fullname constructor as a global utility method which can easily be subject to customization. I think it's better to leave this here rather than selecting the constructor method via the customization object.

Location:

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

Files:

• applicants/applicant.py (modified) (3 diffs)
• students/student.py (modified) (3 diffs)
• utils/helpers.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -19 +19 @@
 import grok
 from grok import index
+from zope.component import getUtility
 from zope.component.interfaces import IFactory
 from zope.component import createObject, getUtility
@@ -29 +30 @@
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
 from waeup.sirp.interfaces import (
-    IObjectHistory, IFileStoreHandler, IFileStoreNameChooser)
+    IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, ISIRPUtils)
 from waeup.sirp.utils.helpers import attrs_to_fields, get_current_principal
 from waeup.sirp.applicants.interfaces import (
@@ -71 +72 @@
     @property
     def fullname(self):
-        # We do not necessarily have the middlename attribute
         middlename = getattr(self, 'middlename', None)
-        if middlename:
-            return '%s %s %s' % (self.firstname,
-                middlename, self.lastname)
-        else:
-            return '%s %s' % (self.firstname, self.lastname)
+        sirp_utils = getUtility(ISIRPUtils)
+        return sirp_utils.fullname(self.firstname, self.lastname, middlename)
 
     def createStudent(self):

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -21 +21 @@
 import os
 import grok
+from zope.component import getUtility
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
@@ -26 +27 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from waeup.sirp.interfaces import (
-    IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler)
+    IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
+    ISIRPUtils)
 from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
@@ -63 +65 @@
     @property
     def fullname(self):
-        # We do not necessarily have the middlename attribute
         middlename = getattr(self, 'middlename', None)
-        if middlename:
-            return '%s %s %s' % (self.firstname,
-                middlename, self.lastname)
-        else:
-            return '%s %s' % (self.firstname, self.lastname)
+        sirp_utils = getUtility(ISIRPUtils)
+        return sirp_utils.fullname(self.firstname, self.lastname, middlename)
 
     @property

main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py

@@ -23 +23 @@
 import shutil
 import grok
-import smtplib
-from email.mime.text import MIMEText
 from cStringIO import StringIO
 from docutils.core import publish_string

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -53 +53 @@
         server.quit()
         return True
+
+    def fullname(self,firstname,lastname,middlename=None):
+        # We do not necessarily have the middlename attribute
+        if middlename:
+            return '%s %s %s' % (firstname, middlename, lastname)
+        else:
+            return '%s %s' % (firstname, lastname)