Changeset 8972

Timestamp:

11 Jul 2012, 07:55:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not show current and previous verdict if postgrad student.

Fix is_postgrad property method.

Location:

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

Files:

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

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

@@ -599 +599 @@
     grok.name('index')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IStudentStudyCourse)
     grok.template('studycoursepage')
     pnav = 4
+
+    @property
+    def form_fields(self):
+        if self.context.is_postgrad:
+            form_fields = grok.AutoFields(IStudentStudyCourse).omit(
+                'current_verdict', 'previous_verdict')
+        else:
+            form_fields = grok.AutoFields(IStudentStudyCourse)
+        return form_fields
 
     @property
@@ -634 +642 @@
     grok.require('waeup.manageStudent')
     grok.template('studycoursemanagepage')
-    form_fields = grok.AutoFields(IStudentStudyCourse)
     label = _('Manage study course')
     pnav = 4
@@ -640 +647 @@
     tabtwoactions = [_('Remove selected levels'),_('Cancel')]
     tabthreeactions = [_('Add study level')]
+
+    @property
+    def form_fields(self):
+        if self.context.is_postgrad:
+            form_fields = grok.AutoFields(IStudentStudyCourse).omit(
+                'current_verdict', 'previous_verdict')
+        else:
+            form_fields = grok.AutoFields(IStudentStudyCourse)
+        return form_fields
 
     def update(self):

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

@@ -61 +61 @@
     @property
     def is_postgrad(self):
+        if self.certificate is None:
+            return False
         return self.certificate.study_mode.startswith('pg')
-        #return cert.start_level == 999 or cert.end_level == 999
 
     def addStudentStudyLevel(self, cert, studylevel):