Changeset 2977 for WAeUP_SRP/base/skins

Timestamp:

3 Jan 2008, 18:47:51 (17 years ago)

Author:

joachim

Message:

fix for #437 please test

File:

• WAeUP_SRP/base/skins/waeup_student/create_level.py (modified) (3 diffs)

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -25 +25 @@
 redirect = response.redirect
 logger = logging.getLogger('Skins.create_level')
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
-member_id = str(member)
-requested_id = context.getStudentId()
-#set_trace()
-create_level =  request.form.get('create_level',None)
-if not create_level or not requested_id or\
-   (not context.isStaff() and member_id != requested_id):
-    logger.info('%s tried to access %s' % (member_id,requested_id))
-    return redirect("%s/srp_anonymous_view" % context.portal_url())
-student_id = context.getStudentId()
+# mtool = context.portal_membership
+# member = mtool.getAuthenticatedMember()
+# member_id = str(member)
+# requested_id = context.getStudentId()
+# #set_trace()
+# create_level =  request.form.get('create_level',None)
+# if not create_level or not requested_id or\
+#    (not context.isStaff() and member_id != requested_id):
+#     logger.info('%s tried to access %s' % (member_id,requested_id))
+#     return redirect("%s/srp_anonymous_view" % context.portal_url())
+# student_id = context.getStudentId()
+info = context.waeup_tool.getAccessInfo(context)
+student_id = info['student_id']
+if student_id is None:
+    return None
 
-lt = context.portal_layouts
-wt = context.waeup_tool
+#lt = context.portal_layouts
+#wt = context.waeup_tool
 student = context.students_catalog.getRecordByKey(student_id)
 cert_id = student.course
@@ -60 +64 @@
     #context.portal_workflow.doActionFor(level,'close_for_edit')
 level_id = level.getId()
+onprobation = context.getContent().previous_verdict in ('C',)
 session_id = context.getLevelSession(level.getContent(),student_id,level_id)
 results = []
@@ -110 +115 @@
         records.append(d)
 # fetch carry_over courses from the course_results catalog
-else:
+elif not onprobation:
     res = aq_results(Eq('student_id',student_id),
                              sortSpecs=('level_id',))