Changeset 3101

Timestamp:

4 Feb 2008, 12:45:36 (17 years ago)

Author:

joachim

Message:

implement getAccessInfo to avoid tracebacks

File:

• WAeUP_SRP/uniben/waeup_custom/getStudyLevelInfo.py (modified) (4 diffs)

WAeUP_SRP/uniben/waeup_custom/getStudyLevelInfo.py

@@ -12 +12 @@
 return Info about the Studylevel
 """
-
-wf = context.portal_workflow
-mtool = context.portal_membership
-if mtool.isAnonymousUser():
-    return None
-member = mtool.getAuthenticatedMember()
-member_id = str(member)
-
 try:
     from Products.zdb import set_trace
@@ -26 +18 @@
         pass
 
+info = context.waeup_tool.getAccessInfo(context)
+student_id = info['student_id']
+if student_id is None:
+    return None
 
-# from Products.AdvancedQuery import Eq, Between, Le,In
-# try:
-#     aq_portal = context.portal_catalog.evalAdvancedQuery
-# except:
-#     aq_portal = context.portal_catalog_real.evalAdvancedQuery
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+member_id = str(member)
+
 course_results = context.course_results
 request = context.REQUEST
@@ -38 +33 @@
 logger = logging.getLogger('Skins.getStudyLevelInfo')
 
-info = {}
-
-student_id = context.getStudentId()
 level_id  =  context.getId()
 level_doc = info['doc'] = context.getContent()
 
-info['is_so'] = is_so = context.isSectionOfficer()
-info['is_student'] = is_student = context.isStudent()
+info['is_so'] = is_so = info['is_sectionofficer']
+#info['is_student'] = is_student = context.isStudent()
 info['is_ca'] = is_ca = context.isCourseAdviser()
-info['student'] = student = context.students_catalog(id=student_id)[0]
+#info['student'] = student = context.students_catalog(id=student_id)[0]
+info['student'] = student = context.students_catalog.getRecordByKey(student_id)
 info['review_state'] = review_state = student.review_state
 is_current_level = level_id == student.level
@@ -60 +53 @@
 
 info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level and not has_verdict) or\
-                            (is_student and school_fee_paid and is_current_level and not has_verdict) or\
+                            (info['is_student'] and school_fee_paid and is_current_level and not has_verdict) or\
                             (is_so and is_current_level and not has_verdict)