Changeset 681

Timestamp:

13 Oct 2006, 06:43:39 (18 years ago)

Author:

Henrik Bettermann

Message:

academics_contents no longer used

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (1 diff)
• skins/waeup_academics/academics_index.py (modified) (2 diffs)
• skins/waeup_accommodation/acco_folder_index.py (modified) (2 diffs)
• skins/waeup_default/id_rename.py (modified) (2 diffs)
• skins/waeup_student/student_index.py (modified) (1 diff)
• skins/waeup_student/students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -285 +285 @@
                 tr_count = 0
             tr_count += 1
-        return self.students.academics_contents()
+        return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
 
 ###)

WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

@@ -18 +18 @@
 
 if pm.isAnonymousUser():
-    return redirect("%s/academics_contents" % context.absolute_url())
-
-campus = context.portal_catalog(meta_type = "University")[-1].getObject()
-
-if context.isManager() or context.isStudent():
+    return redirect("%s/srp_anonymous_view" % context.portal_url())
+else:
     if context.portal_type == 'AcademicsFolder':
         return context.academics.academics_view()
@@ -37 +34 @@
     elif context.portal_type in ('CertificateCourse','Course'):
         return context.academics_document_view()
-    return redirect("%s/academics_contents" % context.absolute_url())
-else:
-    return redirect("%s/academics_contents" % context.absolute_url())
+    return redirect("%s/srp_manager_view" % context.portal_url())
 

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_index.py

@@ -17 +17 @@
 pm = context.portal_membership
 
-if pm.isAnonymousUser():
-    return redirect("%s/academics_contents" % context.absolute_url())
-
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
 
@@ -27 +24 @@
     elif context.portal_type == 'AccoHall':
         return context.acco_hall_view()
-    return redirect("%s/academics_contents" % context.absolute_url())
+    return redirect("%s/srp_manager_view" % context.portal_url())
 else:
-    return redirect("%s/academics_contents" % context.absolute_url())
+    return redirect("%s/srp_anonymous_view" % context.portal_url())
 

WAeUP_SRP/trunk/skins/waeup_default/id_rename.py

@@ -11 +11 @@
 if context.portal_type in ('CoursesFolder',):
     return REQUEST.RESPONSE.redirect(context.absolute_url() + \
-                                ('/academics_contents?portal_status_message=%s' \
+                                ('/academics_index?portal_status_message=%s' \
                                 % ('Courses cannot be renamed',)))
-    
+
 new_ids = REQUEST['new_ids']
 new_ids = [id.upper() for id in REQUEST['new_ids']]
@@ -20 +20 @@
 if context.portal_type == "University":
     here = context.academics
-    
 
-here.manage_renameObjects(REQUEST['ids'], new_ids, REQUEST) 
+
+here.manage_renameObjects(REQUEST['ids'], new_ids, REQUEST)
 
 return REQUEST.RESPONSE.redirect(here.absolute_url() + \

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -19 +19 @@
 if pm.isAnonymousUser():
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
-
 if context.isManager():
     return redirect("%s/student_view" % context.absolute_url())

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -18 +18 @@
 
 if pm.isAnonymousUser():
-    return redirect("%s/srp_anonymous_view" % context.absolute_url())
+    return redirect("%s/srp_anonymous_view" % context.portal_url())
 
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()