pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix route in TO sign button to direct to the form review page and remove modal call

Browse Source
This commit is contained in:
leigh-mil 2019-08-02 15:39:08 -04:00
parent 6280fc3c08
commit 5adb2d016e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/portfolios/task_orders/index.html
View File

@ -6,14 +6,8 @@
{% block portfolio_content %} {% block portfolio_content %}
{% macro TaskOrderReviewButton(task_order, text="Edit", secondary=False, modal=None) %} {% macro TaskOrderButton(task_order, route, text="Edit", secondary=False) %}
<a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id, modal=modal) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}"> <a href="{{ url_for(route, task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
{{ text }}
</a>
{% endmacro %}
{% macro TaskOrderEditButton(task_order, text="Edit", secondary=False) %}
<a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
{{ text }} {{ text }}
</a> </a>
{% endmacro %} {% endmacro %}
@ -60,14 +54,14 @@
{% macro TaskOrderActions(task_order) %} {% macro TaskOrderActions(task_order) %}
<div class="task-order-card__buttons"> <div class="task-order-card__buttons">
{% if task_order.is_draft and user_can(permissions.EDIT_TASK_ORDER_DETAILS) %} {% if task_order.is_draft and user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
{{ TaskOrderEditButton(task_order, text="Edit") }} {{ TaskOrderButton(task_order, "task_orders.edit")}}
{% elif task_order.is_expired %} {% elif task_order.is_expired %}
{{ TaskOrderReviewButton(task_order, text="View") }} {{ TaskOrderButton(task_order, "task_orders.review_task_order", text="View") }}
{% elif task_order.is_unsigned %} {% elif task_order.is_unsigned %}
{% if user_can(permissions.EDIT_TASK_ORDER_DETAILS) %} {% if user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
{{ TaskOrderReviewButton(task_order, text="Sign", secondary=True, modal="submit-to-1") }} {{ TaskOrderButton(task_order, "task_orders.form_step_four_review", text="Sign", secondary=True) }}
{% endif %} {% endif %}
{{ TaskOrderReviewButton(task_order, text="View") }} {{ TaskOrderButton(task_order, "task_orders.review_task_order", text="View") }}
{% endif %} {% endif %}
</div> </div>
{% endmacro %} {% endmacro %}