Changeset 7681 for main/waeup.sirp/trunk/src/waeup/sirp/university/department.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/department.py (modified) (3 diffs)

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

@@ -19 +19 @@
 """
 import grok
-from zope.component import createObject
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from zope.component import getUtility
+from waeup.sirp.university.coursescontainer import CoursesContainer
+from waeup.sirp.university.certificatescontainer import CertificatesContainer
+from waeup.sirp.interfaces import ISIRPUtils
 from waeup.sirp.university.interfaces import IDepartment, IDepartmentAdd
-from waeup.sirp.university.vocabularies import inst_types
 
 class Department(grok.Container):
@@ -53 +55 @@
         self.title_prefix = title_prefix
         self.code = code
-        self.courses = createObject(u'waeup.CoursesContainer')
+        self.courses = CoursesContainer()
         self.courses.__parent__ = self
         self.courses.__name__ = 'courses'
-        self.certificates = createObject(u'waeup.CertificatesContainer')
+        self.certificates = CertificatesContainer()
         self.certificates.__parent__ = self
         self.certificates.__name__ = 'certificates'
@@ -71 +73 @@
 
     def longtitle(self):
+        insttypes_dict = getUtility(ISIRPUtils).getInstTypeDict()
         return "%s %s (%s)" % (
-            inst_types.getTerm(self.title_prefix).title,
+            insttypes_dict[self.title_prefix],
             self.title, self.code)