Changeset 1576 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

18 Mar 2007, 14:48:06 (18 years ago)

Author:

joachim

Message:

Fix for #121 also improve handling of "Processing in progress"

File:

• WAeUP_SRP/trunk/skins/waeup_student/create_level.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -30 +30 @@
 cert_id = student.course
 current_level = student.level
-in_progress =  session.get('in_progress','finished')
-if in_progress == 'finished':
+in_progress =  request.get('in_progress','not started')
+
+if context.hasObject(current_level):
+    response.redirect("%s/%s" % (context.absolute_url(),current_level))
+    return
+
+if in_progress in ('not started','started'):
     session.set('in_progress','started')
-    view = context.in_progress_view(refresh=3,page='%s/study_level_view' % current_level)
+    view = context.in_progress_view(refresh=3,page='create_level?in_progress=started')
     response.setHeader('Content-type','text/html; charset=ISO-8859-15')
     response.setHeader('Content-length','%d' % (len(view)))
@@ -39 +44 @@
     response.write(view)
     response.write('')
-elif in_progress == 'started':
-    return
-
-if context.hasObject(current_level):
-    return
-    level = getattr(context,current_level)
-    return response.redirect("%s" % level.absolute_url())
+    if in_progress == 'started':
+        return
+    
 
 context.invokeFactory('StudentStudyLevel',"%s" % current_level)
@@ -105 +106 @@
         d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
         course_result.getContent().edit(mapping=d)
-session.set('in_progress','finished')
 return