Changeset 9778 for main/waeup.kofa/trunk

Timestamp:

6 Dec 2012, 15:45:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Catch error.

Location:

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

Files:

• tests/test_vocabularies.py (modified) (1 diff)
• vocabularies.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_vocabularies.py

@@ -107 +107 @@
         self.assertEqual(studylevelsource.getTitle(studycourse, 10),
             'Pre-Studies')
+        self.assertEqual(studylevelsource.getTitle(studycourse, 100),
+            'Error: level id ${value} out of range')
+        self.assertEqual(studylevelsource.getTitle(studycourse, 200),
+            'Error: level id ${value} out of range')
         # Finally we modify the certificate to be a mixed course,
         # starting with pre-studies.

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

@@ -89 +89 @@
             start_level = 10
             end_level = 1000
-        if start_level == 999 or end_level == 999:
+        if 999 in (start_level, end_level):
             if value != 999:
                 return _('Error: wrong level id ${value}',
@@ -95 +95 @@
         if value == 999:
             return course_levels.by_value[999].title
+        if start_level == 10 and end_level == 10 and value != 10:
+            return _('Error: level id ${value} out of range',
+                mapping={'value': value})
         if value < start_level or value > end_level + 120:
             return _('Error: level id ${value} out of range',