Changeset 3473 for WAeUP_SRP/base/skins/waeup_default

Timestamp:

29 Apr 2008, 09:24:51 (17 years ago)

Author:

joachim

Message:

remove Title from all StudentObjects?,
adjust templates to use getStudentObjectitles,
remove waeup_academics.getDocumentInfo (was duplicate),
do not use portal_catalog for listing faculties and departments.

Location:

WAeUP_SRP/base/skins/waeup_default

Files:

• getDocumentInfo.py (modified) (1 diff)
• getFolderObjectsInfo.py (added)
• waeup_document_view.pt (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_default/getDocumentInfo.py

@@ -10 +10 @@
 # $Id:getDocumentInfo.py 486 2006-09-06 10:09:39Z joachim $
 """
-return Info about the Faculties
+return Info about a document
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
+
 request = context.REQUEST
 
-wf = context.portal_workflow
-path_info = request.get('PATH_INFO').split('/')
+#wf = context.portal_workflow
+#path_info = request.get('PATH_INFO').split('/')
 
-mtool = context.portal_membership
-if mtool.isAnonymousUser():
+# mtool = context.portal_membership
+# if mtool.isAnonymousUser():
+#     return None
+
+info = context.waeup_tool.getAccessInfo(context)
+#set_trace()
+
+student_id = info['student_id']
+if not info['is_staff'] and student_id is None:
     return None
 
-info = {}
+titles = context.getStudentObjectTitles()
+info['title'] = titles.get(context.portal_type,'') or context.title_or_id
 try:
     info['doc'] = context.getContent()

WAeUP_SRP/base/skins/waeup_default/waeup_document_view.pt

@@ -3 +3 @@
                 tal:define="info context/getDocumentInfo;
                 s_name context/getStudentNameInContext;
-                is_so context/isSectionOfficer;">
+                is_so info/is_sectionofficer;">
 
       <span tal:condition="not: info">
@@ -10 +10 @@
       <span tal:condition="info">
    
-      <a href="" tal:attributes="href string:${here/academicsParent}">
+      <a href="" tal:attributes="href string:${here/aq_parent/absolute_url}">
         <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
         Up one level
       </a>
       
-      <h3 tal:condition="here/title_or_id"> 
+      <h3> 
          <span tal:condition="python:is_so and s_name">
            <span tal:content="s_name" />:
          </span>
-         <span tal:content="here/title_or_id" />
+         <span tal:content="info/title" />
       </h3>