Changeset 911 for WAeUP_SRP/trunk/skins/waeup_academics

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_academics

Files:

• academics_search_view.pt (modified) (4 diffs)
• academics_view.pt (modified) (3 diffs)
• certificate_view.pt (modified) (3 diffs)
• certificates_view.pt (modified) (3 diffs)
• courses_view.pt (modified) (3 diffs)
• department_view.pt (modified) (2 diffs)
• faculty_view.pt (modified) (3 diffs)
• getCertificateInfo.py (modified) (1 diff)
• getCertificatesInfo.py (modified) (1 diff)
• getCoursesCertificatesInfo.py (modified) (1 diff)
• getCoursesInfo.py (modified) (1 diff)
• getDepartmentsInfo.py (modified) (1 diff)
• getDocumentInfo.py (modified) (1 diff)
• getFacultiesInfo.py (modified) (1 diff)
• getLevelInfo.py (modified) (1 diff)
• level_view.pt (modified) (3 diffs)
• searchAcademics.py (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_academics/academics_search_view.pt

@@ -2 +2 @@
             portal_status_message options/psm;
             objects options/objects;
-            is_manager options/is_manager;
+            is_so options/is_so;
             "
             >
@@ -14 +14 @@
     
     <metal:main fill-slot="main">
-      <span tal:condition="not: is_manager">
+      <span tal:condition="not: is_so">
         <metal:block use-macro="here/error_not_found/macros/not_found" />
       </span>
-      <span tal:condition="is_manager"
+      <span tal:condition="is_so"
         tal:define="items objects;
         columns python:3;
@@ -54 +54 @@
                 tal:attributes="class python:test(repeat['object'].even(), 'even ajaxtd', 'odd ajaxtd')">
                 <td align="left" valign="middle" style="width: 5px;" 
-                    tal:condition="is_manager">
+                    tal:condition="is_so">
                   <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                         tal:condition="is_manager"
+                         tal:condition="is_so"
                          tal:define="id object/id"
                          tal:attributes="value id;
@@ -85 +85 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/academics_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getFacultiesInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -24 +24 @@
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="is_manager">
+                tal:condition="is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                     tal:condition="is_manager"
+                     tal:condition="is_so"
                      tal:define="id row/id"
                      tal:attributes="value id;
@@ -54 +54 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/certificate_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getCertificateInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -26 +26 @@
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="is_manager">
+                tal:condition="is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                     tal:condition="is_manager"
+                     tal:condition="is_so"
                      tal:define="id row/id"
                      tal:attributes="value id;
@@ -45 +45 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/certificates_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getCertificatesInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -25 +25 @@
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="is_manager">
+                tal:condition="is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                     tal:condition="is_manager"
+                     tal:condition="is_so"
                      tal:define="id row/id"
                      tal:attributes="value id;
@@ -44 +44 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/courses_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getCoursesInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -53 +53 @@
                   tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
                 <td align="left" valign="middle" style="width: 5px;" 
-                    tal:condition="is_manager">
+                    tal:condition="is_so">
                   <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                         tal:condition="is_manager"
+                         tal:condition="is_so"
                          tal:define="id row/id"
                          tal:attributes="value id;
@@ -84 +84 @@
                 <td align="left" valign="top" rowspan="3"></td>
                 <td align="left" valign="top">
-                  <span tal:condition="is_manager">
+                  <span tal:condition="is_so">
                     <input type="button" value="button_select_all" class="context"
                            onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/department_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getCoursesCertificatesInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -45 +45 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/faculty_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getDepartmentsInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -26 +26 @@
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
-                tal:condition="is_manager">
+                tal:condition="is_so">
               <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                     tal:condition="is_manager"
+                     tal:condition="is_so"
                      tal:define="id row/id"
                      tal:attributes="value id;
@@ -56 +56 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/getCertificateInfo.py

@@ -18 +18 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.campus.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getCertificatesInfo.py

@@ -21 +21 @@
 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
 dep_id = context.aq_parent.getId()
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getCoursesCertificatesInfo.py

@@ -18 +18 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s/faculty_view" % context.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py

@@ -21 +21 @@
 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
 dep_id = context.aq_parent.getId()
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getDepartmentsInfo.py

@@ -22 +22 @@
 member_id = str(member)
 roles = member.getRolesInContext(context)
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getDocumentInfo.py

@@ -18 +18 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager
-info['is_student'] = context.isStudent
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
+info['is_student'] = context.isStudent()
 info['doc'] = context.getContent()
 return info

WAeUP_SRP/trunk/skins/waeup_academics/getFacultiesInfo.py

@@ -19 +19 @@
 
 info = {}
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.campus.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/getLevelInfo.py

@@ -28 +28 @@
 cert_id = pt[-(2+p)]
 level_id = pt[-(1+p)]
-info['is_manager'] = context.isSectionManager()
+info['is_sm'] = context.isSectionManager()
+info['is_so'] = context.isSectionOfficer()
 info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.absolute_url()

WAeUP_SRP/trunk/skins/waeup_academics/level_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getLevelInfo;
-            is_manager info/is_manager|nothing;"
+            is_so info/is_so|nothing;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">
@@ -27 +27 @@
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
               <td align="left" valign="middle" style="width: 5px;" 
-                  tal:condition="is_manager">
+                  tal:condition="is_so">
                 <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                       tal:condition="is_manager"
+                       tal:condition="is_so"
                        tal:define="id row/id"
                        tal:attributes="value id;
@@ -57 +57 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-              <span tal:condition="is_manager">
+              <span tal:condition="is_so">
                 <input type="button" value="button_select_all" class="context"
                        onclick="someJavaScriptFunctionThatWillBeReplaced"

WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py

@@ -22 +22 @@
 mtool = context.portal_membership
 path_info = request.get('PATH_INFO').split('/')
-is_manager = context.isSectionManager
+is_sm = context.isSectionManager()
 validate = request.has_key("cpsdocument_edit_button")
 items = []
@@ -44 +44 @@
                              #psm = "%s, %s" % (psm,ds),
                              objects = items,
-                             is_manager = is_manager,
+                             is_sm = is_sm,
                              choosen_ids = choosen_ids,
                              )
@@ -63 +63 @@
                              #psm = "%s, %s" % (psm,ds),
                              students = items,
-                             is_manager = is_manager,
+                             is_sm = is_sm,
                              choosen_ids = choosen_ids,
                              )
@@ -97 +97 @@
                              #psm = "%s, %s" % (psm,ds),
                              objects = objects,
-                             is_manager = is_manager,
+                             is_sm = is_sm,
                              choosen_ids = choosen_ids,
                              )