Changeset 1589

Timestamp:

19 Mar 2007, 13:27:39 (18 years ago)

Author:

joachim

Message:

added try: except: for workflow actions resolved ticket 128

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• register_courses.py (modified) (1 diff)
• reject_courses.py (modified) (3 diffs)
• validate_courses.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/register_courses.py

@@ -40 +40 @@
     logger.info('%s WorkflowException %s for %s' % (member_id,E,student_id))
     return request.RESPONSE.redirect("%s" % context.absolute_url())
-logger.info('%s registered course list for %s' % (member_id,student_id))
+logger.info('%s registered course list of %s' % (member_id,student_id))
 return request.RESPONSE.redirect("%s" % context.absolute_url())

WAeUP_SRP/trunk/skins/waeup_student/reject_courses.py

@@ -12 +12 @@
 close the Students StudyLevel
 """
+from Products.CMFCore.WorkflowCore import WorkflowException
 try:
     from Products.zdb import set_trace
@@ -29 +30 @@
 wftool.doActionFor(context,'close_for_edit')
 students_folder = context.portal_url.getPortalObject().campus.students
-student = getattr(students_folder,context.getStudentId())
-wftool.doActionFor(student,'reject_courses')
-logger.info('%s rejected course list of %s' % (member,student.getId()))
+student_id = context.getStudentId()
+student = getattr(students_folder,student_id)
+try:
+    wftool.doActionFor(student,'reject_courses')
+except WorkflowException,E:
+    logger.info('%s WorkflowException %s for %s' % (member_id,E,student_id))
+    return request.RESPONSE.redirect("%s" % context.absolute_url())
+logger.info('%s rejected course list of %s' % (member_id,student_id))
 
 args = {}
@@ -42 +48 @@
 url = context.absolute_url() + '/' + action_after_reject + '?' + urlencode(args)
 return REQUEST.RESPONSE.redirect(url)
-
-#return request.RESPONSE.redirect("%s" % context.absolute_url())

WAeUP_SRP/trunk/skins/waeup_student/validate_courses.py

@@ -12 +12 @@
 close the Students StudyLevel
 """
+from Products.CMFCore.WorkflowCore import WorkflowException
 try:
     from Products.zdb import set_trace
@@ -27 +28 @@
 wftool = context.portal_workflow
 students_folder = context.portal_url.getPortalObject().campus.students
-student = getattr(students_folder,context.getStudentId())
-wftool.doActionFor(student,'validate_courses')
-logger.info('%s validated course list of %s' % (member,student.getId()))
+student_id = context.getStudentId()
+student = getattr(students_folder,student_id)
+try:
+    wftool.doActionFor(student,'validate_courses')
+except WorkflowException,E:
+    logger.info('%s WorkflowException %s for %s' % (member_id,E,student_id))
+    return request.RESPONSE.redirect("%s" % context.absolute_url())
+logger.info('%s validated course list of %s' % (member_id,student_id))
 
 psm = 'portal_status_message=Course list validated!'
 url = context.absolute_url() + '/' + action_after_validate +  '?' + psm
 return request.RESPONSE.redirect(url)
-
-