Changeset 888 for WAeUP_SRP


Ignore:
Timestamp:
17 Nov 2006, 21:28:48 (18 years ago)
Author:
Henrik Bettermann
Message:

some fixes according to email
portlet_waeup_status_display now displays also student state

Location:
WAeUP_SRP/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/themes/WAeUP_Backoffice/Default/main/cell_sizer1.xml

    r805 r888  
    22<object name="cell_sizer1" meta_type="Cell Sizer">
    33 <property name="xpos">3</property>
    4  <property name="cellwidth">165px</property>
     4 <property name="cellwidth">280px</property>
    55</object>

  • WAeUP_SRP/trunk/skins/waeup_default/isManager.py

    r885 r888  
    1212mtool = context.portal_membership
    1313roles = mtool.getAuthenticatedMember().getRolesInContext(context)
    14 return "Manager" in roles
     14return "SectionManager" in roles or\
     15       "Manager" in roles

  • WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

    r863 r888  
     1<metal:block define-macro="status_display">
    12<tal:block define="item nocall:options/context_obj;
    2                    info item/getContentInfo;
     3                   item_info item/getContentInfo;
     4                   student_info item/getStudentInfo;
    35                   base_url python: request.get('cpsskins_base_url');
    4                    status_list python: ['checked', 'unchecked', 'opened', 'closed',
    5                                         'created', 'student_created', 'application_pin_entered',
    6                                         'admission_applied',
    7                                         'cleared_and_validated',
    8                                         'pume_passed',
    9                                         'pume_failed',
    10                                         'admitted',
    11                                         'deferred',
    12                                         'objection_raised',
    13                                         'admission_rejected',
    14                                         'finally_rejected',
    15                                         'clearance_pin_entered',
    16                                         'category_A',
    17                                         'category_B',
    18                                         'category_C',
    19                                         'category_D',
    20                                         'category_E',
    21                                         'category_F',
    22                                         'content_addable',
    23                                         'bed_reserved',
    24                                         'maintenance_fee_paid'];">
     6                   states_not_shown python: ('work',);">
    257
    26 <span tal:condition="python:path('info/review_state') in status_list ">
    27   <span tal:content="info/review_state" />
    28 </ span>
    298
     9<span tal:condition="python:path('item_info/review_state') not in states_not_shown ">                   
     10                   
     11  <span tal:condition="student_info">
     12    <span tal:content="student_info/review_state" /> 
     13    <span tal:condition="python:item_info['review_state']!=student_info['review_state']">
     14       / <span tal:content="item_info/review_state" />
     15    </span>
     16  </ span>
     17
     18  <span tal:condition="not: student_info">
     19    <span tal:content="item_info/review_state" />
     20  </span>
     21
     22</span>
    3023</tal:block>
     24</metal:block>
    3125
     26

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

    r885 r888  
    44           isStaff context/isStaff;
    55           isClearanceOfficer context/isClearanceOfficer;
    6            isOwner context/isThisStudent;
     6           isOwner context/isStudent;
    77           review_state info/review_state;
    88           edition python: (isOwner and review_state == 'clearance_pin_entered' or isManager) and not isClearanceOfficer;

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

    r885 r888  
    44           isStaff context/isStaff;
    55           isClearanceOfficer context/isClearanceOfficer;
    6            isOwner context/isThisStudent;
     6           isOwner context/isStudent;
    77           edition python:(isOwner or isManager) and not isClearanceOfficer;
    88           mode python: test(edition,'edit','view');

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

    r885 r888  
    5555           value="Reject Clearance"
    5656           id="reject_clearance_button"
    57            tal:condition="python:review_state == 'cleared_and_validated'" />
     57           tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" />
    5858  </tal:block>
    5959  <!--  isClearanceOfficer -->

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

    r839 r888  
    1919if pm.isAnonymousUser():
    2020    return redirect("%s/srp_anonymous_view" % context.absolute_url())
    21 if context.isManager():
     21if context.isManager() or context.isStaff:
    2222    if context.portal_type == 'StudentStudyCourse':
    2323        return context.study_course_view()
Note: See TracChangeset for help on using the changeset viewer.