Changeset 603 for WAeUP_SRP/trunk/skins/waeup_default

Timestamp:

1 Oct 2006, 10:21:09 (18 years ago)

Author:

Henrik Bettermann

Message:

batch of fixes to open the frontend for the first time

Location:

WAeUP_SRP/trunk/skins/waeup_default

Files:

• campus_index.py (modified) (2 diffs)
• index_html.py (modified) (2 diffs)
• isManager.py (modified) (2 diffs)
• isStudent.py (modified) (2 diffs)
• layout_search_edit.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_default/campus_index.py

@@ -13 +13 @@
 """
 
-
 request = context.REQUEST
 redirect = request.RESPONSE.redirect
@@ -22 +21 @@
 
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
-member = pm.getAuthenticatedMember()
-roles = member.getRoles()
-isManager = "Manager" in roles or "SectionManager" in roles
-isStudent = "Student" in roles
 
-if isManager:
+if context.isManager():
     return redirect("%s/campus_manager_view" % campus.absolute_url())
 
-if isStudent:
+if context.isStudent():
     return redirect("%s/students_index" % campus.students.absolute_url())
 

WAeUP_SRP/trunk/skins/waeup_default/index_html.py

@@ -13 +13 @@
 """
 
-
 request = context.REQUEST
 redirect = request.RESPONSE.redirect
@@ -21 +20 @@
     return redirect("%s/srp_anonymous_view" % request.get('URL1'))
 
-member = pm.getAuthenticatedMember()
-roles = member.getRoles()
-isManager = "Manager" in roles or "SectionManager" in roles
-isStudent = "Student" in roles
-
-if isManager:
+if context.isManager():
     return redirect("%s/srp_manager_view" % context.absolute_url())
 
-if isStudent:
+if context.isStudent():
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
 

WAeUP_SRP/trunk/skins/waeup_default/isManager.py

@@ -10 +10 @@
 # $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
 """
-return True if the member is considered a Manager in this context
+return True if the member is considered a Manager,
+consider all non-Student members to be Managers
+
 """
 request = context.REQUEST
@@ -18 +20 @@
 member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRolesInContext(context)
+#roles = member.getRolesInContext(context)
+roles = member.getRoles()
 isStudent = "Student" in roles
 isStaff = not isStudent
-isManager = "Manager" in roles or "SectionManager" in roles or isStaff
+#isManager = "Manager" in roles or "SectionManager" in roles or isStaff
+isManager = isStaff
 return isManager

WAeUP_SRP/trunk/skins/waeup_default/isStudent.py

@@ -10 +10 @@
 # $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
 """
-return True if the member is considered a Student in this context
+return True if the member is considered a Student
 """
 request = context.REQUEST
@@ -18 +18 @@
 member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRolesInContext(context)
+#roles = member.getRolesInContext(context)
+roles = member.getRoles()  # Student role is global 
 isStudent = "Student" in roles
-isStaff = not isStudent
-isManager = "Manager" in roles or "SectionManager" in roles or isStaff
 return isStudent

WAeUP_SRP/trunk/skins/waeup_default/layout_search_edit.pt

@@ -22 +22 @@
     <div class=''>
       <div class='documentFields'>
-        <table width="80%" cellpadding="2" cellspacing="2" summary="Form layout">
+        <table width="" cellpadding="2" cellspacing="2" summary="Form layout">
           <tr tal:repeat="row layout/rows" valign="top">
             <td tal:repeat="cell row"