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/skins/waeup_student
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • 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.