Changeset 11619 for main

Timestamp:

5 May 2014, 14:28:44 (10 years ago)

Author:

Henrik Bettermann

Message:

Let constructMatricNumber return error message.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py (modified) (3 diffs)

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

@@ -519 +519 @@
         next_integer = grok.getSite()['configuration'].next_matric_integer
         if next_integer == 0:
-            return None
-        return unicode(next_integer)
+            return _('Matriculation number cannot be set.'), None
+        return None, unicode(next_integer)
 
     def setMatricNumber(self, student):
@@ -535 +535 @@
         This method is tested but not used in the base package. It can
         be used in custom packages by adding respective views
-        and by customizing _composeMatricNumber according to the
+        and by customizing constructMatricNumber according to the
         university's matriculation number construction rules.
 
@@ -544 +544 @@
         if student.certcode is None:
             return _('No certificate assigned.'), None
-        matric_number = self.constructMatricNumber(student)
-        if not matric_number:
-            return _('Matriculation number cannot be set.'), None
+        error, matric_number = self.constructMatricNumber(student)
+        if error:
+            return error, None
         try:
             student.matric_number = matric_number