Changeset 7681 for main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py

Timestamp:

22 Feb 2012, 21:14:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Uses sources instead of vocabularies and feed sources with dictionaries defined in SIRPUtils. This way we can easily customize the sources.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py (modified) (2 diffs)

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

@@ -22 +22 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from zope.component import getUtility
+from waeup.sirp.interfaces import ISIRPUtils
 from waeup.sirp.university.interfaces import (
     IFaculty, IFacultyAdd, IDepartment)
-from waeup.sirp.university.vocabularies import inst_types
 
 class Faculty(grok.Container):
@@ -60 +61 @@
 
     def longtitle(self):
-        try:
-            result = "%s %s (%s)" % (
-                inst_types.getTerm(
-                    self.title_prefix).title,
-                self.title, self.code)
-        except:
-            result = "%s (%s)" % (self.title, self.code)
+        insttypes_dict = getUtility(ISIRPUtils).getInstTypeDict()
+        result = "%s %s (%s)" % (
+            insttypes_dict[self.title_prefix],
+            self.title, self.code)
         return result