Changeset 937 for WAeUP_SRP/trunk


Ignore:
Timestamp:
25 Nov 2006, 09:00:34 (18 years ago)
Author:
Henrik Bettermann
Message:

setup SectionOfficer? role

Location:
WAeUP_SRP/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Academics.py

    r930 r937  
    235235            course_id = course.get('code')
    236236            if course_id in course_list:
    237                 msg = "Dupplicate Course %(code)s" % course
     237                msg = "Multiple Course Code"
    238238                logger.info(msg)
    239239                no_import.write('"%s",' % msg)
    … …  
    376376            code = cert_course.get('certificate_code')
    377377##            pid = "%(depid)s_%(code)s" % vars()
    378             pid = "%(code)s" % vars()           
     378            pid = "%(code)s" % vars()
    379379            if not pid in certs.keys():
    380380                em = 'CertCode %(certificate_code)s for %(code)s not found\n' % cert_course

  • WAeUP_SRP/trunk/profiles/default/actions.xml

    r924 r937  
    44  <action title="Search Members" action_id="member_view" category="user"
    55     condition_expr="member"
    6      url_expr="string:${portal_url}/search_members_form"
    7      visible="False">
     6     url_expr="string:${portal_url}/search_members_form" visible="False">
    87   <permission>View</permission>
    98  </action>
    … …  
    10099  <action title="Portal Members" action_id="members" category="global"
    101100     condition_expr="member"
    102      url_expr="string:${portal_url}/search_members_form"
    103      visible="True">
     101     url_expr="string:${portal_url}/search_members_form" visible="True">
    104102   <permission>Modify portal content</permission>
    105103  </action>
    … …  
    119117  </action>
    120118  <action title="Students" action_id="view_students" category="navigation"
    121      condition_expr="python:here.isStaff()" url_expr="string:${portal_url}/campus/students"
    122      visible="True">
     119     condition_expr="python:portal.campus.students.isStaff()"
     120     url_expr="string:${portal_url}/campus/students" visible="True">
    123121   <permission>View</permission>
    124122  </action>
    125123  <action title="PINs" action_id="view_pins" category="navigation"
    126      condition_expr="member" url_expr="string:${portal_url}/campus/pins"
    127      visible="True">
    128    <permission>Modify portal content</permission>
     124     condition_expr="python:portal.campus.pins.isSectionOfficer()"
     125     url_expr="string:${portal_url}/campus/pins" visible="True">
     126   <permission>View</permission>
    129127  </action>
    130128  <action title="Contact" action_id="contact_admin" category="navigation"
    131      condition_expr="member" url_expr="string:${portal_url}/contact_admin_form" visible="True">
     129     condition_expr="member"
     130     url_expr="string:${portal_url}/contact_admin_form" visible="True">
    132131   <permission>View</permission>
    133132  </action>
    134133  <action title="Support" action_id="support" category="student_navigation"
    135      condition_expr="member" url_expr="string:${portal_url}/support_form" visible="True">
     134     condition_expr="member" url_expr="string:${portal_url}/support_form"
     135     visible="True">
    136136   <permission>View</permission>
    137137  </action>
    … …  
    160160   <permission>View</permission>
    161161  </action>
    162 
    163162  <action title="My Accommodation" action_id="reserve_accommodation"
    164163     category="student_navigation" condition_expr="member"
    165164     url_expr="string:${portal_url}/reserve_accommodation" visible="True"/>
    166    <permission>View</permission>
    167 
    168165  <action title="Register Courses" action_id="register_courses"
    169166     category="student" condition_expr="member"
    170167     url_expr="string:${portal_url}/register_courses" visible="False"/>
    171    <permission>View</permission>
    172 
    173168  <action title="Home" action_id="students_home" category="student_navigation"
    174169     condition_expr="member" url_expr="string:${portal_url}" visible="True">

  • WAeUP_SRP/trunk/profiles/default/rolemap.xml

    r899 r937  
    1414      <role name="SectionOfficer"/>
    1515    </permission>
     16    <permission name="View" acquire="True">
     17      <role name="SectionManager"/>
     18      <role name="SectionReader"/>
     19      <role name="SectionOfficer"/>
     20    </permission>   
    1621    <permission name="Add portal content" acquire="True">
    1722      <role name="SectionManager"/>
    … …  
    3641    <permission name="List portal members" acquire="True">
    3742      <role name="SectionManager"/>
     43      <role name="SectionOfficer"/>
    3844    </permission>
    3945    <permission name="Review portal content" acquire="True">

  • WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

    r901 r937  
    2121else:
    2222    if context.portal_type == 'AcademicsFolder':
    23         return context.academics.academics_view()
     23        return context.academics_view()
    2424    elif context.portal_type == 'Faculty':
    2525        return context.faculty_view()

  • WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_index.py

    r903 r937  
    1010# $Id$
    1111"""
    12 return the appropriate page in the academics section
     12return the appropriate page in the accommodation section
    1313"""
    1414
    … …  
    1717pm = context.portal_membership
    1818
    19 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
    20 
    21 if context.isSectionManager():
     19if context.isSectionOfficer():
    2220    if context.portal_type == 'AccoFolder':
    2321        return context.accommodation.acco_folder_view()

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt

    r911 r937  
    2929<!--  buttons -->
    3030<metal:block define-macro="buttons">
    31   <!-- SectionManager -->
    32   <tal:block condition="context/isSectionManager">
     31  <!-- SectionOfficer -->
     32  <tal:block condition="context/isSectionOfficer">
    3333 
    3434     <div tal:condition="python:info['review_state'] == 'clearance_pin_entered'">

  • WAeUP_SRP/trunk/skins/waeup_student/students_index.py

    r920 r937  
    2525if "ClearanceOfficers" in member.getGroups():
    2626    return redirect("%s/search_students" % students_url)
    27 if context.isSectionManager():
     27if context.isSectionOfficer():
    2828    return redirect("%s/search_students" % students_url)
    2929if context.isStudent():
Note: See TracChangeset for help on using the changeset viewer.