Changeset 2570

Timestamp:

7 Nov 2007, 13:11:30 (17 years ago)

Author:

joachim

Message:

allow removal only for deaktivated students

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• remove_students.py (modified) (1 diff)
• remove_students_form.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/remove_students.py

@@ -76 +76 @@
         student['deleted'] = delete and student_id in ids
         if student_id in brains_dict.keys():
-            student['found'] = True
-            student['id'] = brains_dict[student_id].id
-            student['jamb_reg_no'] = brains_dict[student_id].jamb_reg_no
-            student['name'] = brains_dict[student_id].name
-            student['matric_no'] = brains_dict[student_id].matric_no
+            brain = brains_dict[student_id]
+            student['id'] = brain.id
+            student['review_state'] = brain.review_state
+            student['jamb_reg_no'] = brain.jamb_reg_no
+            student['name'] = brain.name
+            student['matric_no'] = brain.matric_no
+            if brain.review_state == "deaktivated":
+                student['found'] = True
+            else:
+                student['found'] = False
         else:
             student['found'] = False

WAeUP_SRP/base/skins/waeup_student/remove_students_form.pt

@@ -90 +90 @@
                       <span tal:content="student/id" tal:condition="not: student/show_checkbox" tal:omit-tag="" />
                     </td>    
+                    <td><span tal:replace="student/review_state" /></td>   
                     <td>
                       <span tal:replace="student/name" />