Changeset 57 for waeup_product/trunk/skins/waeup_student

Timestamp:

19 Oct 2005, 09:42:03 (19 years ago)

Author:

joachim

Message:

=more

Location:

waeup_product/trunk/skins/waeup_student

Files:

• create_jamb.py (modified) (2 diffs)
• process_waeup_login.py (modified) (1 diff)
• students_folder_view.py (moved) (moved from waeup_product/trunk/skins/waeup_student/student_folder_view.py) (1 diff)
• students_folder_view_anon.pt (copied) (copied from waeup_product/trunk/skins/waeup_student/students_folder_view_student.pt)
• students_folder_view_manager.pt (copied) (copied from waeup_product/trunk/skins/waeup_student/students_folder_view_student.pt)

waeup_product/trunk/skins/waeup_student/create_jamb.py

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

waeup_product/trunk/skins/waeup_student/process_waeup_login.py

@@ -27 +27 @@
 pkw = {}
 pkw['sex'] = getattr(jamb,'sex')
-pkw['lastname'] = getattr(jamb,'name')
+pkw['firstname'] = getattr(jamb,'firstname')
+pkw['middlename'] = getattr(jamb,'middlename')
+pkw['lastname'] = getattr(jamb,'lastname')
+pkw['aggregate'] = getattr(jamb,'aggregate')
+pkw['faculty'] = getattr(jamb,'faculty')
+pkw['age'] = getattr(jamb,'age')
+pkw['state'] = getattr(jamb,'state')
+
 pd.edit(mapping=pkw)
 context.notifyCPSDocumentCreation(ob=pd)

waeup_product/trunk/skins/waeup_student/students_folder_view.py

@@ -6 +6 @@
 will be displayed, otherwise first post will be displayed."""
 
-admin = "SectionManager" in context.portal_membership.getAuthenticatedMember().getRolesInContext(context)
 
-return context.student_folder_view_main(admin = admin,psm=psm,groups=groups)
+member = context.portal_membership.getAuthenticatedMember()
+if member:
+    if 'Student' in member.getGroups():
+        return context.students_folder_view_students(psm=psm,groups=groups)
+    if 'StudentsManager' in member.getGroups():
+        return context.students_folder_view_manager(psm=psm,groups=groups)
+return context.students_folder_view_anon(psm=psm,groups=groups)