Changeset 911 for WAeUP_SRP/trunk/skins/waeup_accommodation

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_accommodation

Files:

• acco_folder_view.pt (modified) (3 diffs)
• acco_hall_view.pt (modified) (1 diff)
• getAccoFolderInfo.py (modified) (1 diff)
• getAccoHallInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getAccoFolderInfo;
-            is_manager info/is_manager|nothing;
+            is_so info/is_so|nothing;
             beds_generated options/beds_generated|nothing"
             >
@@ -48 +48 @@
             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;
@@ -78 +78 @@
             <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_accommodation/acco_hall_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getAccoHallInfo;
-            is_manager info/is_manager|nothing;"
+<metal:html tal:define="info context/getAccoHallInfo;"
             >
   <metal:body use-macro="here/waeup_content_master/macros/master">

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoFolderInfo.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.absolute_url()

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallInfo.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()