Changeset 1576

Timestamp:

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

Author:

joachim

Message:

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

Location:

WAeUP_SRP/trunk

Files:

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

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py

@@ -71 +71 @@
     ## patch to assign dynamic roles for WAeUP
     while 1:
-        break
-        if self.isStudent() or self.isSectionOfficer():
+        #from pdb import set_trace;set_trace()
+        if self.isStudent():
+            break
+        groups = self.portal_membership.getAuthenticatedMember().getGroups()
+        if not ("ClearanceOfficer" in groups or "CourseAdviser" in groups):
             break
         if callable(real_object) and hasattr(real_object,'im_self'):
@@ -80 +83 @@
             break
         if hasattr(real_object,'portal_type') and\
-                   real_object.portal_type not in ("Student","StudentClearance","StudentStudyLevel"):
+                   real_object.portal_type not in ("Student",
+                                                   "StudentClearance",
+                                                   "StudentStudyLevel"):
             break
 
-        #from pdb import set_trace;set_trace()
         # can be later simplified by replacing by students_catalog values - Henrik
         # getattr works always because of acquisition ?! Henrik
@@ -115 +119 @@
                                                 )
         if real_object.portal_type == "StudentStudyLevel":
-            context_obj = getattr(certificate_obj,real_object.getId())
+            if real_object.meta_type == "StudentStudyLevel":
+                #if it is not a Proxy
+                break
+            context_obj = getattr(certificate_obj,real_object.getId(),None)
+            if context_obj is None:
+                break
             allowed = ('CourseAdviser', 'SectionManager')
         else:

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