Changeset 739 for WAeUP_SRP/trunk/skins

Timestamp:

21 Oct 2006, 13:37:37 (18 years ago)

Author:

Henrik Bettermann

Message:

academics_document_view.pt renamed and moved

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_academics/academics_document_view.pt (deleted)
• waeup_academics/academics_index.py (modified) (2 diffs)
• waeup_default/waeup_document_view.pt (added)
• waeup_student/getStudentInfo.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

@@ -29 +29 @@
         return context.courses_view()
     elif context.portal_type == 'CertificatesFolder':
-        return context.certificates_view()        
+        return context.certificates_view()
     elif context.portal_type == 'Certificate':
         return context.certificate_view()
@@ -35 +35 @@
         return context.level_view()
     elif context.portal_type in ('CertificateCourse','Course'):
-        return context.academics_document_view()
+        return context.waeup_document_view()
     return redirect("%s/srp_manager_view" % context.portal_url())
 

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -25 +25 @@
 member_id = str(member)
 if student is None:
-    if context.isManager():
+    if context.isManager() and 'students' in context.getPhysicalPath():
         if context.portal_type == 'Student':
             student_id = context.getId()
@@ -31 +31 @@
             student_id = context.aq_parent.getId()
         elif context.aq_parent.aq_parent.portal_type == 'Student':
-            student_id = context.aq_parent.aq_parent.getId()    
+            student_id = context.aq_parent.aq_parent.getId()
         elif context.aq_parent.aq_parent.aq_parent.portal_type == 'Student':
-            student_id = context.aq_parent.aq_parent.aq_parent.getId()   
+            student_id = context.aq_parent.aq_parent.aq_parent.getId()
         else:
-            student_id = member_id            
+            student_id = member_id
     else:
         student_id = member_id
@@ -87 +87 @@
     row['type'] = so.portal_type
     row['is_editable'] = mtool.checkPermission('Modify portal content', soo)
-    sv_link = s_view_links.get(so.portal_type,None) or "academics_document_view"
+    sv_link = s_view_links.get(so.portal_type,None) or "waeup_document_view"
     row['s_view_link'] = "%s/%s" % (soo.absolute_url(),sv_link)
     se_link = s_edit_links.get(so.portal_type,None)