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

Timestamp:

12 Mar 2012, 08:04:03 (13 years ago)

Author:

Henrik Bettermann

Message:

We don't need methods to fetch dictionaries.

Update interfaces.

Location:

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

Files:

• department.py (modified) (1 diff)
• faculty.py (modified) (1 diff)
• vocabularies.py (modified) (8 diffs)

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

@@ -73 +73 @@
 
     def longtitle(self):
-        insttypes_dict = getUtility(IKofaUtils).getInstTypeDict()
+        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
         return "%s %s (%s)" % (
             insttypes_dict[self.title_prefix],

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

@@ -61 +61 @@
 
     def longtitle(self):
-        insttypes_dict = getUtility(IKofaUtils).getInstTypeDict()
+        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
         result = "%s %s (%s)" % (
             insttypes_dict[self.title_prefix],

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

@@ -46 +46 @@
             # see sources below
             from waeup.kofa.interfaces import IKofaUtils
-            return getUtility(IKofaUtils).getSemesterDict().keys()
+            return getUtility(IKofaUtils).SEMESTER_DICT.keys()
         except:
             return [9]
@@ -56 +56 @@
         try:
             from waeup.kofa.interfaces import IKofaUtils
-            semesters_dict = getUtility(IKofaUtils).getSemesterDict()
+            semesters_dict = getUtility(IKofaUtils).SEMESTER_DICT
             return semesters_dict[value]
         except:
@@ -66 +66 @@
     """
     def getValues(self, context):
-        insttypes_dict = getUtility(IKofaUtils).getInstTypeDict()
+        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
         return sorted(insttypes_dict.keys())
 
@@ -73 +73 @@
 
     def getTitle(self, context, value):
-        insttypes_dict = getUtility(IKofaUtils).getInstTypeDict()
+        insttypes_dict = getUtility(IKofaUtils).INST_TYPES_DICT
         return insttypes_dict[value]
 
@@ -81 +81 @@
     """
     def getValues(self, context):
-        appcats_dict = getUtility(IKofaUtils).getAppCatDict()
+        appcats_dict = getUtility(IKofaUtils).APP_CATS_DICT
         return sorted(appcats_dict.keys())
 
@@ -88 +88 @@
 
     def getTitle(self, context, value):
-        appcats_dict = getUtility(IKofaUtils).getAppCatDict()
+        appcats_dict = getUtility(IKofaUtils).APP_CATS_DICT
         return appcats_dict[value]
 
@@ -96 +96 @@
     """
     def getValues(self, context):
-        studymodes_dict = getUtility(IKofaUtils).getStudyModesDict()
+        studymodes_dict = getUtility(IKofaUtils).STUDY_MODES_DICT
         return sorted(studymodes_dict.keys())
 
@@ -103 +103 @@
 
     def getTitle(self, context, value):
-        studymodes_dict = getUtility(IKofaUtils).getStudyModesDict()
+        studymodes_dict = getUtility(IKofaUtils).STUDY_MODES_DICT
         return studymodes_dict[value]