Changeset 2752

Timestamp:

24 Nov 2007, 06:06:14 (17 years ago)

Author:

Henrik Bettermann

Message:

close_for_edit deprecated

Objects should always be opened unless the verdict has been imported.

We need a script which opens all levels before we import the verdicts.

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• create_level.py (modified) (3 diffs)
• getLevelSession.py (modified) (1 diff)
• getStudyCourseInfo.py (modified) (1 diff)
• reject_courses.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -57 +57 @@
     context.portal_workflow.doActionFor(level,'open')
     level.getContent().edit(mapping={'session': current_session})
-    context.portal_workflow.doActionFor(level,'close_for_edit')
+    #context.portal_workflow.doActionFor(level,'close_for_edit')
 level_id = level.getId()
 session_id = context.getLevelSession(level.getContent(),student_id,level_id)
@@ -67 +67 @@
 
 
-# fetch carry_over courses from results_import   
+# fetch carry_over courses from results_import
 if student.session in ('6', '06') and results:
     carry_overs = results
@@ -109 +109 @@
         d['session_id'] = session_id
         records.append(d)
-# fetch carry_over courses from the course_results catalog         
-# else 
+# fetch carry_over courses from the course_results catalog
+# else
 
-# fetch session courses from the certificate  
+# fetch session courses from the certificate
 res = context.portal_catalog(portal_type="Certificate", id = cert_id)
 if res:

WAeUP_SRP/base/skins/waeup_student/getLevelSession.py

@@ -27 +27 @@
     session_id = session_id[2:4]
 if len(session_id) != 2:
-    logger.info("invalid session %s in level %s for student %s" % 
+    logger.info("invalid session %s in level %s for student %s" %
                 (session_id,level_id,student_id))
 else:
     if changed:
-        context.portal_workflow.doActionFor(level_doc.aq_parent,'open')
+        try:
+            context.portal_workflow.doActionFor(level_doc.aq_parent,'open')
+        except:
+            pass
         level_doc.edit(mapping={'session': session_id})
-        context.portal_workflow.doActionFor(level_doc.aq_parent,'close_for_edit')
-return session_id 
+        #context.portal_workflow.doActionFor(level_doc.aq_parent,'close_for_edit')
+return session_id
 
-    
 
+

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -84 +84 @@
 review_state = wftool.getInfoFor(context,'review_state',None)
 student_review_state = sbrain.review_state
-if review_state != 'content_addable' and student_review_state == 'school_fee_paid': #and context.isStudent():
-    wftool.doActionFor(context,'close_for_edit')
+#if review_state != 'content_addable' and student_review_state == 'school_fee_paid': #and context.isStudent():
+#    wftool.doActionFor(context,'close_for_edit')
 
 has_paid = student_review_state == 'school_fee_paid'

WAeUP_SRP/base/skins/waeup_student/reject_courses.py

@@ -27 +27 @@
 
 wftool = context.portal_workflow
-wftool.doActionFor(context,'open')
-wftool.doActionFor(context,'close_for_edit')
+try:
+    wftool.doActionFor(context,'open')
+except:
+    pass
+#wftool.doActionFor(context,'close_for_edit')
 students_folder = context.portal_url.getPortalObject().campus.students
 student_id = context.getStudentId()