Changeset 889

Timestamp:

17 Nov 2006, 22:18:39 (18 years ago)

Author:

Henrik Bettermann

Message:

readability improved
isStudent instead of isOwner

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• clearance_edit_form.pt (modified) (1 diff)
• clearance_edit_lib.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -4 +4 @@
            isStaff context/isStaff;
            isClearanceOfficer context/isClearanceOfficer;
-           isOwner context/isStudent;
+           isStudent context/isStudent;
            review_state info/review_state;
-           edition python: (isOwner and review_state == 'clearance_pin_entered' or isManager) and not isClearanceOfficer;
-           mode python: test(edition,'edit','view');
+           clear_review_state info/clear_review_state;
+           editable python: (isStudent and clear_review_state == 'open' or isManager) and not isClearanceOfficer;
+           mode python: test(editable,'edit','view');
            rendered_main python:info['clear_doc'].render(request=request,
                                                layout_mode = mode,

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt

@@ -4 +4 @@
 <metal:block define-macro="header">
   <!--  Administration -->
-  <tal:block condition="python: not(isStaff or isManager or isOwner)">
+  <tal:block condition="python: not(isStaff or isManager or isStudent)">
     <metal:block use-macro="here/error_not_found/macros/not_found" />
   </tal:block>
@@ -22 +22 @@
   </tal:block>
   <!--  Student -->
-  <tal:block condition="python: isOwner">
+  <tal:block condition="python: isStudent">
     <a href=""
        tal:attributes="href string:${here/academicsParent}">