Changeset 13125

Timestamp:

1 Jul 2015, 18:35:23 (9 years ago)

Author:

Henrik Bettermann

Message:

Move VERDICTS_DICT to KofaUtils?.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• students/interfaces.py (modified) (3 diffs)
• students/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -561 +561 @@
 
     def _set_verdicts(self):
-        verdicts = getUtility(IStudentsUtils).VERDICTS_DICT
+        verdicts = getUtility(IKofaUtils).VERDICTS_DICT
         self.verdicts = verdicts.items()
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -24 +24 @@
 from waeup.kofa.interfaces import (
     IKofaObject, academic_sessions_vocab, validate_email, ICSVExporter,
-    ContextualDictSourceFactoryBase)
+    ContextualDictSourceFactoryBase, IKofaUtils)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.schema import TextLineChoice, FormattedDate, PhoneNumber
@@ -57 +57 @@
     """
     def getValues(self, context):
-        verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
+        verdicts_dict = getUtility(IKofaUtils).VERDICTS_DICT
         return sorted(verdicts_dict.keys())
 
@@ -64 +64 @@
 
     def getTitle(self, context, value):
-        verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
+        verdicts_dict = getUtility(IKofaUtils).VERDICTS_DICT
         if value != '0':
             return verdicts_dict[value] + ' (%s)' % value

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -928 +928 @@
         return None
 
-    VERDICTS_DICT = {
-        '0': _('(not yet)'),
-        'A': 'Successful student',
-        'B': 'Student with carryover courses',
-        'C': 'Student on probation',
-        }
-
     SEPARATORS_DICT = {
         }

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

@@ -200 +200 @@
         }
 
+    VERDICTS_DICT = {
+        '0': _('(not yet)'),
+        'A': 'Successful student',
+        'B': 'Student with carryover courses',
+        'C': 'Student on probation',
+        }
+
     #: Set positive number for allowed max, negative for required min
     #: avail.