Changeset 3301

Timestamp:

9 Mar 2008, 22:30:59 (17 years ago)

Author:

Henrik Bettermann

Message:

request.RESPONSE.redirect without return doesn't make sense

minor changes in workflow

Location:

WAeUP_SRP

Files:

• base/skins/waeup_default/waeup_edit.py (modified) (4 diffs)
• base/skins/waeup_upload/uploads_index.py (modified) (3 diffs)
• uniben/profiles/default/workflows/waeup_document_wf/definition.xml (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_default/waeup_edit.py

@@ -2 +2 @@
 # $Id: external_edit.py 805 2006-11-09 09:38:29Z joachim $
 """
-Called when a document form is posted.
-
-Validates data, then:
-
- - if there's no error, updates the object and redirects to it,
-
- - if there's an error, puts data in session and redirects to edit form.
-
-A form uid is propagated during the redirect to uniquely identify the
-form in the session.
 """
 
@@ -24 +14 @@
 mtool = context.portal_membership
 member = mtool.getAuthenticatedMember()
+doc = context.getContent()
 
-# Check flexible controls
-#context.editLayouts(REQUEST=REQUEST)
-
-# Validate the document and write it if it's valid
-# (We don't call getEditableContent here, validate does it when needed.)
-doc = context.getContent()
-if context.portal_type == "StudentStudyCourse":
-    if len(context.objectIds()) > 0:
-        psm = 'Edit of StudentStudyCourse is only possible if there are no levels inside!'
-        args = getFormUidUrlArg(REQUEST)
-        args['portal_status_message'] = psm
-        url = context.absolute_url() + '?' + urlencode(args)
-        REQUEST.RESPONSE.redirect(url)
+#if context.portal_type == "StudentStudyCourse":
+#    if len(context.objectIds()) > 0:
+#        psm = 'Edit of StudentStudyCourse is only possible if there are no levels inside!'
+#        args = getFormUidUrlArg(REQUEST)
+#        args['portal_status_message'] = psm
+#        url = context.absolute_url() + '?' + urlencode(args)
+#        return REQUEST.RESPONSE.redirect(url)
 
 is_valid, ds = doc.validate(request=REQUEST, proxy=context, cluster=cluster,
@@ -44 +29 @@
 student_id = context.getStudentId()
 
-##if action is None:
-##    ti = doc.getTypeInfo()
-##    action = ti.queryMethodID('edit', 'external_edit_form')
-##    action = '/' + action
-
 action = "/" + came_from
 if is_valid:
@@ -54 +34 @@
     context.cpsdocument_notify_modification(comments=comments)
 
-    ###################################################
-    if False:
-        if context.portal_type == "StudentStudyCourse":
-            course = ds.get('study_course')
-            #student_id = context.getStudentId()
-            res = context.portal_catalog(portal_type='Certificate',id = course)
-            if res:
-                c_brain = res[0]
-                c_path = c_brain.getPath().split('/')
-                #student_id = context.getStudentId()
-                context.students_catalog.modifyRecord(id = student_id,
-                                                      course = course,
-                                                      level = ds.get('current_level'),
-                                                      verdict = ds.get('current_verdict'),
-                                                      faculty = c_path[-4],
-                                                      department = c_path[-3],
-                                                      )
-                logger.info('%s edited %s (%s) of %s' % (member,context.id,course,student_id))
-
-        elif context.portal_type == "StudentApplication": # disabled
-            entry_mode = ds.get('entry_mode')
-            #student_id = context.getStudentId()
-            context.students_catalog.modifyRecord(id = student_id,
-                                                  entry_mode = entry_mode,
-                                                 )
-            logger.info('%s edited %s of %s' % (member,context.id,student_id))
-        elif context.portal_type == "StudentClearance":
-            matric_no = ds.get('matric_no')
-            #student_id = context.getStudentId()
-            context.students_catalog.modifyRecord(id = student_id,
-                                                  matric_no = matric_no,
-                                                 )
-            logger.info('%s edited %s of %s' % (member,context.id,student_id))
-        elif context.portal_type in ("StudentPersonal",):
-            name = "%(firstname)s %(middlename)s %(lastname)s" % ds
-            name = name.strip()
-            name = name.replace('  ',' ')
-            email = ds.get('email')
-            phone = ds.get('phone')
-            #student_id = context.getStudentId()
-            #app_doc = context.application.getContent()
-            #jamb_sex = 'M'
-            #if ds.get('sex'):
-            #    jamb_sex = 'F'
-            # originally imported data must be kept; app_doc should not be changed here
-            #app_doc.edit(mapping={'jamb_lastname': name,
-            #                      'jamb_sex': jamb_sex
-            #                      })
-            context.students_catalog.modifyRecord(id = student_id,
-                                                  name = name,
-                                                  email = email,
-                                                  phone = phone,
-                                                  sex = ds.get('sex'),
-                                                 )
-            logger.info('%s edited %s of %s' % (member,context.id,student_id))
-        elif context.portal_type == "xxxxCourse": # disabled handled by events
-            dd = {}
-            dd.update(ds) # ds is not a real dictionary
-            try:
-                context.courses_catalog.modifyRecord(**dd)
-            except KeyError:
-                context.courses_catalog.addRecord(**dd)
-    ###################################################
 
 

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -35 +35 @@
 info['doc'] = context.getContent()
 
+logger.info('%s views upload section' % member)
+
 edit = request.form.has_key('edit')
 ids = request.get('ids',[])
@@ -57 +59 @@
             for key in new_keys:
                 logger.info('%s changed column heading in file %s from %s to %s' % (member,long_id,key[0],key[1]))
-        request.RESPONSE.redirect(context.absolute_url())
-
+        
 wrong = []
 imported = []
@@ -138 +139 @@
 d['url'] = upload.absolute_url()
 upload.getContent().edit(mapping=d)
-logger.info('%s uploaded file %s in layout mode %s' % (member,filename,d['import_layout']))
+logger.info('%s uploaded file %s with import layout %s' % (member,filename,d['import_layout']))
 
-request.RESPONSE.redirect(context.absolute_url())
+return request.RESPONSE.redirect(context.absolute_url())
 

WAeUP_SRP/uniben/profiles/default/workflows/waeup_document_wf/definition.xml

@@ -10 +10 @@
   <permission-map name="View" acquired="True">
    <permission-role>Anonymous</permission-role>
+   <<permission-role>Authenticated</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>SectionManager</permission-role>
@@ -20 +21 @@
              new_state="static" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -31 +32 @@
              title="Create content" new_state=""
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -45 +46 @@
              title="Cut/Copy/Paste" new_state=""
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>