diff --git a/sstreasury/jinja2/sstreasury/budget_view.html b/sstreasury/jinja2/sstreasury/budget_view.html index 7334869..f8f7dad 100644 --- a/sstreasury/jinja2/sstreasury/budget_view.html +++ b/sstreasury/jinja2/sstreasury/budget_view.html @@ -27,36 +27,30 @@ Status: {{ revision.get_state_display() }} {% if is_latest %} - {% if revision.state == import('sstreasury.models').BudgetState.DRAFT.value or revision.state == import('sstreasury.models').BudgetState.RESUBMIT.value %} + {% if revision.can_submit(request.user) %} - - {#{% if request.user.groups.filter(name='Secretary').exists() %} - - - - {% endif %}#} - {% elif revision.state == import('sstreasury.models').BudgetState.AWAIT_REVIEW.value and request.user.groups.filter(name='Treasury').exists() %} + {% endif %} + {% if revision.can_endorse(request.user) %} - {% elif revision.state != import('sstreasury.models').BudgetState.APPROVED.value and request.user.groups.filter(name='Secretary').exists() %} + {% endif %} + {% if revision.can_approve(request.user) %} - {% elif revision.state == import('sstreasury.models').BudgetState.APPROVED.value %} - {# Blank #} - {% else %} + {% endif %} + {% if revision.can_withdraw(request.user) %} {% endif %} - {% if revision.state == import('sstreasury.models').BudgetState.DRAFT.value or revision.state == import('sstreasury.models').BudgetState.RESUBMIT.value or (revision.state != import('sstreasury.models').BudgetState.APPROVED.value and (request.user.groups.filter(name='Treasury').exists() or request.user.groups.filter(name='Secretary').exists())) %} + {% if revision.can_edit(request.user) %} Edit - Print - {% elif revision.state == import('sstreasury.models').BudgetState.APPROVED.value %} - Print - {% else %} - Print - + {% endif %} + + Print + + {% if not revision.can_edit(request.user) and revision.can_withdraw(request.user) %}
diff --git a/sstreasury/jinja2/sstreasury/claim_view.html b/sstreasury/jinja2/sstreasury/claim_view.html index d9c0fc0..7750da8 100644 --- a/sstreasury/jinja2/sstreasury/claim_view.html +++ b/sstreasury/jinja2/sstreasury/claim_view.html @@ -26,26 +26,25 @@