Changeset 911 for WAeUP_SRP/trunk/skins/waeup_default

Timestamp:

20 Nov 2006, 15:11:29 (18 years ago)

Author:

Henrik Bettermann

Message:

new local roles implemented
role SectionOfficer? not yet tested

Location:

WAeUP_SRP/trunk/skins/waeup_default

Files:

• getDynamicRoles.py (modified) (1 diff)
• isSectionOfficer.py (added)
• isStaff.py (modified) (1 diff)
• waeup_document_view.pt (modified) (2 diffs)
• waeup_edit_form.pt (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_default/getDynamicRoles.py

@@ -12 +12 @@
 return the dynamic roles
 """
-return ('ClearanceOfficer','CourseAdviser')
+return ('ClearanceOfficer','CourseAdviser','SectionManager')
 

WAeUP_SRP/trunk/skins/waeup_default/isStaff.py

@@ -16 +16 @@
 return "Manager" in roles or\
        "SectionManager" in roles or\
+       "SectionOfficer" in roles or\
        "ClearanceOfficer" in roles or\
        "ClearanceOfficers" in member.getGroups()

WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getDocumentInfo;
                         s_info context/getStudentInfo;
-                        is_manager info/is_manager|nothing;"
+                        is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -11 +11 @@
       </a>
       <h3> 
-         <span tal:condition="python:is_manager and s_info">
+         <span tal:condition="python:is_so and s_info">
            <span tal:content="s_info/student/Title" />:
          </span>

WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt

@@ -8 +8 @@
            form_type string:waeup;
            creation python:False;
-           edition python:True;
+           is_allowed context/isSectionOfficer
            metadata metadata|nothing;
            ">
@@ -15 +15 @@
   
   <metal:block fill-slot="header">
-    <span tal:condition="not: context/isSectionManager">
+    <span tal:condition="not: is_allowed">
         <metal:block use-macro="here/error_not_found/macros/not_found" />
     </span>
-    <span tal:condition="context/isSectionManager">
+    <span tal:condition="is_allowed">
     <h3 tal:condition="creation" i18n:translate="">
       Create a document of type
@@ -33 +33 @@
     </a>
     <h3>
-      <tal:block condition="python: edition and not metadata"
+      <tal:block condition="not: metadata"
         i18n:translate="">Edit <span id="page_title" i18n:name="title"
         tal:content="here/title_or_id">Page Title</span>
@@ -47 +47 @@
   
  
-  <metal:block fill-slot="main" tal:condition="context/isSectionManager">
+  <metal:block fill-slot="main" tal:condition="is_allowed">
     <form action="waeup_edit" method="post" id="editForm"
           enctype="multipart/form-data" class="workflow"