Changeset 10561 for main/waeup.kofa/trunk/src/waeup/kofa/university

Timestamp:

29 Aug 2013, 15:11:14 (11 years ago)

Author:

Henrik Bettermann

Message:

If no prefix is selected do not prepend a whitespace.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/university

Files:

• department.py (modified) (2 diffs)
• faculty.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/university/department.py

@@ -23 +23 @@
 from zope.interface import implementedBy
 from zope.component import getUtility
+from waeup.kofa.university.faculty import longtitle
 from waeup.kofa.university.coursescontainer import CoursesContainer
 from waeup.kofa.university.certificatescontainer import CertificatesContainer
@@ -86 +87 @@
 
     def longtitle(self):
-        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
-        return "%s %s (%s)" % (
-            insttypes_dict[self.title_prefix],
-            self.title, self.code)
+        return longtitle(self)
 
 class DepartmentFactory(grok.GlobalUtility):

main/waeup.kofa/trunk/src/waeup/kofa/university/faculty.py

@@ -26 +26 @@
 from waeup.kofa.university.interfaces import (
     IFaculty, IFacultyAdd, IDepartment)
+
+def longtitle(inst):
+    insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
+    if inst.title_prefix == 'none':
+        return "%s (%s)" % (inst.title, inst.code)
+    return "%s %s (%s)" % (
+        insttypes_dict[inst.title_prefix],
+        inst.title, inst.code)
 
 class Faculty(grok.Container):
@@ -65 +73 @@
 
     def longtitle(self):
-        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
-        result = "%s %s (%s)" % (
-            insttypes_dict[self.title_prefix],
-            self.title, self.code)
-        return result
+        return longtitle(self)
 
 class FacultyFactory(grok.GlobalUtility):