Changeset 1590

Timestamp:

19 Mar 2007, 16:00:15 (18 years ago)

Author:

Henrik Bettermann

Message:

action strings added

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• add_course_result.py (modified) (4 diffs)
• delete_course_result.py (modified) (3 diffs)
• external_study_level_view.pt (modified) (1 diff)
• refresh_level.py (modified) (3 diffs)
• register_courses.py (modified) (3 diffs)
• reject_courses.py (modified) (1 diff)
• study_level_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=
+##parameters=REQUEST=None, action_after_validate=None
 ##title=
 ##
@@ -22 +22 @@
     def set_trace():
         pass
-request = context.REQUEST
+#request = context.REQUEST
 course_cat = context.courses_catalog
 from Products.AdvancedQuery import Eq, Between, Le,In
@@ -57 +57 @@
     return request.RESPONSE.redirect(url)
 
-   
+
 cr_id = context.invokeFactory('StudentCourseResult',course_id)
 #set_trace()
@@ -66 +66 @@
 args['course_id'] = course_id
 
-logger.info('%s added StudentCourseResult object %s' % (member,course_id))   
+logger.info('%s added StudentCourseResult object %s' % (member,course_id))
 
-from urllib import urlencode
-url = "%s?%s" % (context.absolute_url(),urlencode(args))
-return request.RESPONSE.redirect(url)
+psm = "You successfully added course %s!" course_id
+args['portal_status_message'] = psm
+url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
+return REQUEST.RESPONSE.redirect(url)
 

WAeUP_SRP/trunk/skins/waeup_student/delete_course_result.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=ids=[], REQUEST=None
+##parameters=ids=[], REQUEST=None, action_after_reject=None, action_after_validate=None
 ##title=
 ##
@@ -15 +15 @@
 from Products.CMFCore.utils import getToolByName
 here = context
-
+from urllib import urlencode
 import logging
 logger = logging.getLogger('Skins.delete_course_result')
@@ -35 +35 @@
 else:
     message = 'portal_status_message=psm_select_at_least_one_document'
-
+    
+args['portal_status_message'] = message
+url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
 if REQUEST is not None:
-    return REQUEST.RESPONSE.redirect(ret_url + '?' + message)
+    return REQUEST.RESPONSE.redirect(url)    

WAeUP_SRP/trunk/skins/waeup_student/external_study_level_view.pt

@@ -191 +191 @@
                      class="context" value="Add Course" 
                      />
+              <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
+                       tal:attributes="value string:external_study_level_view"/>                      
             </td>                
         </table>

WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py

@@ -1 @@
-##parameters=
+##parameters=REQUEST=None, student=None, action_after_reject=None, action_after_validate=None
 # $Id$
 """
@@ -18 +18 @@
 import logging
 logger = logging.getLogger('Skins.refresh_level')
+
+from urllib import urlencode
 
 current = DateTime.DateTime()
@@ -100 +102 @@
 session.set('in_progress','finished')
 logger.info('%s updated course list' % member)
-return
-return response.redirect("%s" % level.absolute_url())
+
+psm = "Course list updated!"
+args['portal_status_message'] = psm
+url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
+return REQUEST.RESPONSE.redirect(url)

WAeUP_SRP/trunk/skins/waeup_student/register_courses.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=student=None
+##parameters=REQUEST=None, student=None, action_after_reject=None, action_after_validate=None
 ##title=
 ##
@@ -18 +18 @@
     def set_trace():
         pass
+
+from urllib import urlencode        
 
 request = context.REQUEST
@@ -41 +43 @@
     return request.RESPONSE.redirect("%s" % context.absolute_url())
 logger.info('%s registered course list of %s' % (member_id,student_id))
-return request.RESPONSE.redirect("%s" % context.absolute_url())
+
+
+psm = "You successfully submitted your course list!"
+args['portal_status_message'] = psm
+url = context.absolute_url() + '/' + action_after_validate + '?' + urlencode(args)
+return REQUEST.RESPONSE.redirect(url)

WAeUP_SRP/trunk/skins/waeup_student/reject_courses.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=REQUEST, student=None, action_after_reject=None, action_after_validate=None
+##parameters=REQUEST=None, student=None, action_after_reject=None, action_after_validate=None
 ##title=
 ##

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -198 +198 @@
                      class="context" value="Add Course" 
                      />
+              <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
+                       tal:attributes="value string:/study_level_view"/>                       
             </td>                
         </table>