Changeset 1653 for WAeUP_SRP/branches/uli/skins/waeup_student/delete_course_result.py

Timestamp:

28 Mar 2007, 02:35:25 (18 years ago)

Author:

uli

Message:

Incorporated changeset 1593:1652 of trunk into uli-branch.

File:

• WAeUP_SRP/branches/uli/skins/waeup_student/delete_course_result.py (modified) (2 diffs)

WAeUP_SRP/branches/uli/skins/waeup_student/delete_course_result.py

@@ -14 +14 @@
 
 from Products.CMFCore.utils import getToolByName
+from AccessControl import Unauthorized
+
 here = context
 from urllib import urlencode
@@ -30 +32 @@
             real_ids.append(id)
     if real_ids:
-        context.manage_delObjects(real_ids)
-        logger.info('%s deleted StudentCourseResult object %s' % (member,id))
-        message = 'psm_item(s)_deleted'
+        try:
+            context.manage_delObjects(real_ids)
+            logger.info('%s deleted StudentCourseResult object %s for %s' % (member,id,context.getStudentId()))
+            message = 'psm_item(s)_deleted'
+        except Unauthorized:
+            logger.info('%s has no permission to delete StudentCourseResult objects for %s' % (member,context.getStudentId()))
+            message = 'no item(s) deleted'
 else:
     message = 'psm_select_at_least_one_document'
-    
+
 args = {}
 args['portal_status_message'] = message
-url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
+
+if action_after_validate:
+    url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
+else:
+    url = context.absolute_url() + '?' + urlencode(args)
 if REQUEST is not None:
-    return REQUEST.RESPONSE.redirect(url)    
+    return REQUEST.RESPONSE.redirect(url)