Changeset 901

Timestamp:

20 Nov 2006, 07:33:16 (18 years ago)

Author:

Henrik Bettermann

Message:

srp_manager_view and campus_manager_view renamed

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actions.xml (modified) (1 diff)
• skins/waeup_academics/academics_index.py (modified) (1 diff)
• skins/waeup_accommodation/acco_folder_index.py (modified) (1 diff)
• skins/waeup_default/campus_index.py (modified) (1 diff)
• skins/waeup_default/campus_manager_view.pt (deleted)
• skins/waeup_default/index_html.py (modified) (1 diff)
• skins/waeup_default/srp_manager_view.pt (deleted)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -119 +119 @@
   </action>
   <action title="Students" action_id="view_students" category="navigation"
-     condition_expr="python:here.isStaff() or here.isManager()" url_expr="string:${portal_url}/campus/students"
+     condition_expr="python:here.isStaff()" url_expr="string:${portal_url}/campus/students"
      visible="True">
    <permission>View</permission>

WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

@@ -36 +36 @@
     elif context.portal_type in ('CertificateCourse','Course'):
         return context.waeup_document_view()
-    return redirect("%s/srp_manager_view" % context.portal_url())
+    return redirect("%s/srp_view" % context.portal_url())
 

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_index.py

@@ -24 +24 @@
     elif context.portal_type == 'AccoHall':
         return context.acco_hall_view()
-    return redirect("%s/srp_manager_view" % context.portal_url())
+    return redirect("%s/srp_view" % context.portal_url())
 else:
     return redirect("%s/srp_anonymous_view" % context.portal_url())

WAeUP_SRP/trunk/skins/waeup_default/campus_index.py

@@ -22 +22 @@
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
 
-if context.isManager():
-    return redirect("%s/campus_manager_view" % campus.absolute_url())
-
 if context.isStudent():
     return redirect("%s/students_index" % campus.students.absolute_url())
+else:
+    return redirect("%s/campus_view" % campus.absolute_url())
 

WAeUP_SRP/trunk/skins/waeup_default/index_html.py

@@ -19 +19 @@
 if pm.isAnonymousUser():
     return redirect("%s/srp_anonymous_view" % request.get('URL1'))
+elif context.isStudent():
+    return redirect("%s/srp_anonymous_view" % context.absolute_url())
+else:
+        return redirect("%s/srp_view" % context.absolute_url())
 
-if context.isManager():
-    return redirect("%s/srp_manager_view" % context.absolute_url())
-
-if context.isStudent():
-    return redirect("%s/srp_anonymous_view" % context.absolute_url())
-