Changeset 9217 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

21 Sep 2012, 11:21:05 (12 years ago)

Author:

uli

Message:

Merge changes from uli-async-update back into trunk.

Location:

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

Files:

• browser.py (modified) (1 diff)
• catalog.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)

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

@@ -33 +33 @@
     invalidate_accesscode, get_access_code)
 from waeup.kofa.accesscodes.workflow import USED
-from waeup.kofa.browser import (
+from waeup.kofa.browser.layout import (
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
-    ContactAdminForm, KofaForm, NullValidator)
+    KofaForm, NullValidator)
+from waeup.kofa.browser.pages import ContactAdminForm
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
 from waeup.kofa.browser.resources import datepicker, datatable, tabs, warning

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

@@ -63 +63 @@
         self.state = context.state
         self.translated_state = context.translated_state
-        #try:
-        #    current_level = course_levels.getTerm(
-        #        context['studycourse'].current_level).title
-        #except LookupError:
-        #    current_level = None
-        #self.current_level = current_level
-
-        self.current_level = context['studycourse'].current_level
-
+        try:
+            current_level = course_levels.getTerm(
+                context['studycourse'].current_level).title
+        except LookupError:
+            current_level = None
+        self.current_level = current_level
         try:
             current_session = academic_sessions_vocab.getTerm(

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

@@ -21 +21 @@
 from zope import schema
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
+from waeup.kofa.browser.interfaces import IStudentNavigationBase
 from waeup.kofa.interfaces import (
     IKofaObject, academic_sessions_vocab, validate_email, ICSVExporter)
@@ -131 +132 @@
     unique_student_id = Attribute("""A unique student id.""")
 
-class IStudentNavigation(IKofaObject):
+class IStudentNavigation(IStudentNavigationBase):
     """Interface needed for student navigation, logging, etc.