Changeset 8323

Timestamp:

2 May 2012, 08:17:14 (13 years ago)

Author:

Henrik Bettermann

Message:

We need to customize StudentStudyCourse? and StudentStudyLevel?. Therefore it's better to use the factory utility.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• student.py (modified) (2 diffs)
• studycourse.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

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

@@ -658 +658 @@
     def addStudyLevel(self, **data):
         level_code = self.request.form.get('addlevel', None)
-        studylevel = StudentStudyLevel()
+        studylevel = createObject(u'waeup.StudentStudyLevel')
         studylevel.level = int(level_code)
         try:
@@ -1724 +1724 @@
     def update(self, SUBMIT=None):
         if not self.context.getStudent().state in (CLEARED,RETURNING):
-            self.flash(_("Wrong state"))
+            self.flash(_("You are in wrong state."))
+            self.redirect(self.url(self.context))
+            return
+        if not self.context.may_register:
+            self.flash(_("You are not entitled to start course registration."))
             self.redirect(self.url(self.context))
             return
@@ -1786 +1790 @@
     @action(_('Create course list now'), style='primary')
     def addStudyLevel(self, **data):
-        studylevel = StudentStudyLevel()
+        studylevel = createObject(u'waeup.StudentStudyLevel')
         studylevel.level = self.context.current_level
         studylevel.level_session = self.context.current_session

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

@@ -22 +22 @@
 import grok
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowInfo
-from zope.component import getUtility
+from zope.component import getUtility, createObject
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
@@ -161 +161 @@
     else:
         student.clearance_locked = True
-    studycourse = StudentStudyCourse()
+    studycourse = createObject(u'waeup.StudentStudyCourse')
     student['studycourse'] = studycourse
     payments = StudentPaymentsContainer()

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

@@ -40 +40 @@
     def getStudent(self):
         return self.__parent__
+
+    @property
+    def may_register(self):
+        return True
 
     def addStudentStudyLevel(self, cert, studylevel):

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

@@ -444 +444 @@
     @property
     def target_url(self):
-        if not self.context.getStudent().state in (CLEARED,RETURNING):
+        if not self.context.getStudent().state in (CLEARED,RETURNING) \
+            or not self.context.may_register:
             return ''
         return self.view.url(self.view.context, self.target)