Changeset 9437 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

27 Oct 2012, 05:35:04 (12 years ago)

Author:

Henrik Bettermann

Message:

Make level_session required and let officers select the right level_session when adding study levels.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (2 diffs)

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

@@ -43 +43 @@
 from waeup.kofa.interfaces import (
     IKofaObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm,
-    IKofaUtils, IUniversity, IObjectHistory)
+    IKofaUtils, IUniversity, IObjectHistory, academic_sessions)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.widgets.datewidget import (
@@ -878 +878 @@
             yield(dict(code=code, title=title))
 
+    @property
+    def session_dict(self):
+        yield(dict(code='', title='--'))
+        for item in academic_sessions():
+            code = item[1]
+            title = item[0]
+            yield(dict(code=code, title=title))
+
     @action(_('Add study level'))
     def addStudyLevel(self, **data):
         level_code = self.request.form.get('addlevel', None)
+        level_session = self.request.form.get('level_session', None)
+        if not level_session:
+            self.flash(_('You must select a session for the level.'))
+            self.redirect(self.url(self.context, u'@@manage')+'?tab2')
+            return
         studylevel = createObject(u'waeup.StudentStudyLevel')
         studylevel.level = int(level_code)
-        studylevel.level_session = self.context.current_session
+        studylevel.level_session = int(level_session)
         try:
             self.context.addStudentStudyLevel(