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

Merge pull request #993 from dod-ccpo/perms-bug-fixes

Browse Source 
Permissions bug fixes
This commit is contained in:
leigh-mil 2019-08-01 14:53:37 -04:00 committed by GitHub
commit 277d41e003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/fragments/applications/edit_team.html
View File

@ -75,12 +75,6 @@
{% endfor %} {% endfor %}
</ul> </ul>
<div class="accordion-table__item__action-group"> <div class="accordion-table__item__action-group">
{% if user_can(permissions.ASSIGN_ENVIRONMENT_MEMBER) %}
<a class="icon-link">
{{ "portfolios.applications.team_settings.add_to_environment" | translate }}
{{ Icon("plus") }}
</a>
{% endif %}
{% if user_can(permissions.DELETE_APPLICATION_MEMBER) %} {% if user_can(permissions.DELETE_APPLICATION_MEMBER) %}
<a class="usa-button button-danger" v-on:click="openModal('{{ delete_modal_id }}')"> <a class="usa-button button-danger" v-on:click="openModal('{{ delete_modal_id }}')">
{{ "portfolios.applications.remove_member.button" | translate }} {{ "portfolios.applications.remove_member.button" | translate }}

14
templates/portfolios/header.html
View File

@ -23,12 +23,14 @@
</div> </div>
</div> </div>
<div class='row links'> <div class='row links'>
{{ Link( {% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %}
icon='funding', {{ Link(
text='navigation.portfolio_navigation.breadcrumbs.funding' | translate, icon='funding',
url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id), text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.review_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"], url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
) }} active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.review_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"],
) }}
{% endif %}
{{ Link( {{ Link(
icon='applications', icon='applications',
text='navigation.portfolio_navigation.breadcrumbs.applications' | translate, text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,

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

@ -59,14 +59,15 @@
{% 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 %} {% if task_order.is_draft and user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
{{ TaskOrderEditButton(task_order, text="Edit") }} {{ TaskOrderEditButton(task_order, text="Edit") }}
{% elif task_order.is_expired %} {% elif task_order.is_expired %}
{{ TaskOrderReviewButton(task_order, text="View") }} {{ TaskOrderReviewButton(task_order, text="View") }}
{% elif task_order.is_unsigned %} {% elif task_order.is_unsigned %}
{{ TaskOrderReviewButton(task_order, text="Sign", secondary=True, modal="submit-to-1") }} {% if user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
{{ TaskOrderReviewButton(task_order, text="Sign", secondary=True, modal="submit-to-1") }}
{% endif %}
{{ TaskOrderReviewButton(task_order, text="View") }} {{ TaskOrderReviewButton(task_order, text="View") }}
{% else %}
{% endif %} {% endif %}
</div> </div>
{% endmacro %} {% endmacro %}