Changeset 3492

Timestamp:

6 May 2008, 11:36:36 (17 years ago)

Author:

joachim

Message:

fix traceback for anonymous users,
do not show log-message, when student views academic session.

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_default/getDocumentInfo.py (modified) (1 diff)
• skins/waeup_default/waeup_document_view.pt (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -188 +188 @@
             if not is_student and requested_id:
                 student_id  = requested_id
-            elif not is_staff and (is_anonymous or member_id != requested_id):
+            elif not is_allowed and (not is_staff or  member_id != requested_id):
                 logger.info('%s tried to access %s of %s' % (member_id,context.portal_type,requested_id))
             else:

WAeUP_SRP/base/skins/waeup_default/getDocumentInfo.py

@@ -31 +31 @@
 
 student_id = info['student_id']
-if not info['is_staff'] and student_id is None:
-    return None
+# if not info['is_staff'] and student_id is None:
+#     return info
+    #return None
 
 titles = context.getStudentObjectTitles()

WAeUP_SRP/base/skins/waeup_default/waeup_document_view.pt

@@ -8 +8 @@
       <span tal:content="here/illegal_view" />
     </span>
-    <span tal:condition="info" tal:define="breadcrumbs context/getBreadCrumbs">
-      <a tal:condition="not: breadcrumbs" 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>
-      <div tal:condition="breadcrumbs">
-        <span tal:repeat="crumb breadcrumbs"><a href="crumb" 
-                                                           tal:attributes="href crumb/url"
-                                                           tal:content="crumb/title"></a> 
-          <span tal:condition="not: repeat/crumb/end">&gt;</span>
-        </span>
-      </div>
-      
-      <h3> 
-         <span tal:condition="python:is_so and s_name">
-           <span tal:content="s_name" />:
-         </span>
-         <span tal:content="info/title" />
-      </h3>
-      
-      <br />
-
-      <span tal:omit-tag=""  
-            tal:content="structure python: info['doc'].render(layout_mode='view')" />
-
+    <span tal:condition="not:info/is_anonymous" tal:omit-tag="">
+      <span tal:define="breadcrumbs context/getBreadCrumbs|nothing">
+        <a tal:condition="not: breadcrumbs" 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>
+        <div tal:condition="breadcrumbs">
+          <span tal:repeat="crumb breadcrumbs"><a href="crumb" 
+                                                  tal:attributes="href crumb/url"
+                                                  tal:content="crumb/title"></a> 
+            <span tal:condition="not: repeat/crumb/end">&gt;</span>
+          </span>
+        </div>
+      </span>      
+    </span>      
+    <h3> 
+      <span tal:condition="python:is_so and s_name">
+        <span tal:content="s_name" />:
       </span>
-    </metal:main> 
-    <metal:sub fill-slot="sub"/>
+      <span tal:content="info/title" />
+    </h3>
+    <br />
+    <span tal:omit-tag=""  
+          tal:content="structure python: info['doc'].render(layout_mode='view')" />
+  </metal:main> 
+  <metal:sub fill-slot="sub"/>
 </metal:body>