Changeset 2009

Timestamp:

11 Jul 2007, 04:59:50 (17 years ago)

Author:

Henrik Bettermann

Message:

ticket #307

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (1 diff)
• profiles/default/workflows/waeup_student_subobject_wf/definition.xml (modified) (6 diffs)
• skins/waeup_default/waeup_document_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -770 +770 @@
                       'StudentClearance':
                           {'id': 'clearance',
-                           'title': 'Clearance Data',
+                           'title': 'Clearance/Eligibility Record',
                            'wf_transition_return': 'close',
                            'wf_transition_admit': 'remain',

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml

@@ -77 +77 @@
   </permission-map>
   <permission-map name="View" acquired="True">
-   <permission-role>Anonymous</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>SectionOfficer</permission-role>
@@ -106 +105 @@
              new_state="closed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -118 +117 @@
              new_state="content_addable" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -130 +129 @@
              new_state="created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -139 +138 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
   </guard>
@@ -147 +146 @@
              new_state="opened" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>

WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
-    <metal:block fill-slot="header"
-                 tal:define="s_name context/getStudentNameInContext;
-                             is_so context/isSectionOfficer;">
+    <metal:main fill-slot="main"
+                tal:define="info context/getDocumentInfo;
+                s_name context/getStudentNameInContext;
+                is_so context/isSectionOfficer;">
+
+      <span tal:condition="not: info">
+        <span tal:content="here/illegal_view" />
+      </span>
+      <span tal:condition="info">
+   
       <a href=""
          tal:attributes="href string:${here/academicsParent}">
@@ -8 +15 @@
         Up one level
       </a>
+      
       <h3> 
          <span tal:condition="python:is_so and s_name">
@@ -14 +22 @@
          <span tal:content="here/title_or_id" />
       </h3>
+      
       <br />
-    </metal:block>
-    <metal:main fill-slot="main"
-                tal:define="info context/getDocumentInfo">
+
       <span tal:omit-tag=""  
             tal:content="structure python: info['doc'].render(layout_mode='view')" />
-    
+
+      </span>
     </metal:main> 
     <metal:sub fill-slot="sub"/>