Changeset 89 for waeup_product/trunk/skins/waeup_student

Timestamp:

26 Oct 2005, 11:54:25 (19 years ago)

Author:

joachim

Message:

=make workflows work

Location:

waeup_product/trunk/skins/waeup_student

Files:

• create_jamb.py (modified) (1 diff)
• jamb_index_html.py (modified) (1 diff)
• student_index_html.py (modified) (1 diff)
• student_personal_index_html.py (modified) (1 diff)
• students_folder_view.py (modified) (1 diff)
• students_folder_view_all.pt (moved) (moved from waeup_product/trunk/skins/waeup_student/student_folder_view_all.pt)

waeup_product/trunk/skins/waeup_student/create_jamb.py

@@ -52 +52 @@
     noCPSMember = False
     try:
-        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember'))
+        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student'))
     except:
         noCPSMember = True
     if noCPSMember:
         pr.addMember(s_id, 'UnSeT',roles=('Member',))
-    groups = context.portal_directories.groups
-    gm = list(groups.getEntry('Students')['members'])
-    gm.extend((s_id,))
-    groups.editEntry({'group': 'Students', 
-                      'members': gm})  
+##    groups = context.portal_directories.groups
+##    gm = list(groups.getEntry('Students')['members'])
+##    gm.extend((s_id,))
+##    groups.editEntry({'group': 'Students', 
+##                      'members': gm})  
     return context.students_folder_view_manager(psm=psm)
 ##    return context.create_jamb_form(rendered = res,

waeup_product/trunk/skins/waeup_student/jamb_index_html.py

@@ -7 +7 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.jamb_view_manager()
-elif 'Students' in member.getGroups():
-    return context.jamb_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.jamb_view_manager()
+return context.jamb_view_student()

waeup_product/trunk/skins/waeup_student/student_index_html.py

@@ -8 +8 @@
 #return context.student_view_manager()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
-    elif 'StudentManager' in member.getGroups():
+    elif 'StudentManager' in roles:
         return context.student_view_manager()
-    elif 'Students' in member.getGroups():
-        return context.student_view_student()
+return context.student_view_student()

waeup_product/trunk/skins/waeup_student/student_personal_index_html.py

@@ -7 +7 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.student_personal_view_manager()
-elif 'Students' in member.getGroups():
-    return context.student_personal_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.student_personal_view_manager()
+return context.student_personal_view_student()

waeup_product/trunk/skins/waeup_student/students_folder_view.py

@@ -9 +9 @@
 member = context.portal_membership.getAuthenticatedMember()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
+    elif 'StudentManager' in roles:
+        return context.students_folder_view_manager(psm=psm)
+    elif 'Student' in roles:
+        return context.students_folder_view_student(psm=psm)
 return context.students_folder_view_all(psm=psm)