Update display of PPoC and remove option to edit PPoC perms
This commit is contained in:
leigh-mil
parent
5036504ae2
commit
0c733dd365
@ -42,7 +42,9 @@ def filter_members_data(members_list):
|
|||||||
members_data = []
|
members_data = []
|
||||||
for member in members_list:
|
for member in members_list:
|
||||||
permission_sets = filter_perm_sets_data(member)
|
permission_sets = filter_perm_sets_data(member)
|
||||||
ppoc = PermissionSets.PORTFOLIO_POC in member.permission_sets
|
ppoc = (
|
||||||
|
PermissionSets.get(PermissionSets.PORTFOLIO_POC) in member.permission_sets
|
||||||
|
)
|
||||||
member_data = {
|
member_data = {
|
||||||
"role_id": member.id,
|
"role_id": member.id,
|
||||||
"user_name": member.user_name,
|
"user_name": member.user_name,
|
||||||
|
|||||||
@ -9,83 +9,85 @@
|
|||||||
|
|
||||||
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
||||||
{% for member in members -%}
|
{% for member in members -%}
|
||||||
{% set invite_pending = member.status == 'invite_pending' %}
|
{% if not member.ppoc -%}
|
||||||
{% set invite_expired = member.status == 'invite_expired' %}
|
{% set invite_pending = member.status == 'invite_pending' %}
|
||||||
|
{% set invite_expired = member.status == 'invite_expired' %}
|
||||||
|
|
||||||
{% set modal_name = "edit_member-{}".format(loop.index) %}
|
{% set modal_name = "edit_member-{}".format(loop.index) %}
|
||||||
{% call Modal(modal_name, classes="form-content--app-mem") %}
|
{% call Modal(modal_name, classes="form-content--app-mem") %}
|
||||||
<div class="modal__form--header">
|
|
||||||
<h1>{{ Icon('avatar') }} {{ "portfolios.applications.members.form.edit_access_header" | translate({ "user": member.user_name }) }}</h1>
|
|
||||||
</div>
|
|
||||||
<base-form inline-template>
|
|
||||||
<form id='{{ modal_name }}' method="POST" action="{{ url_for('portfolios.update_member', portfolio_id=portfolio.id, portfolio_role_id=member.role_id) }}">
|
|
||||||
{{ member.form.csrf_token }}
|
|
||||||
{{ member_form.SubmitStep(
|
|
||||||
name=modal_name,
|
|
||||||
form=member_form_fields.PermsFields(member.form, member_role_id=member.role_id),
|
|
||||||
submit_text="Save Changes",
|
|
||||||
previous=False,
|
|
||||||
modal=modal_name,
|
|
||||||
) }}
|
|
||||||
</form>
|
|
||||||
</base-form>
|
|
||||||
{% endcall %}
|
|
||||||
|
|
||||||
{% if invite_pending or invite_expired -%}
|
|
||||||
{% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
|
|
||||||
{% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
|
|
||||||
<div class="modal__form--header">
|
<div class="modal__form--header">
|
||||||
<h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
|
<h1>{{ Icon('avatar') }} {{ "portfolios.applications.members.form.edit_access_header" | translate({ "user": member.user_name }) }}</h1>
|
||||||
</div>
|
</div>
|
||||||
<base-form inline-template :enable-save="true">
|
<base-form inline-template>
|
||||||
<form id='{{ resend_invite_modal }}' method="POST" action="{{ url_for('portfolios.resend_invitation', portfolio_id=portfolio.id, portfolio_token=member.invite_token) }}">
|
<form id='{{ modal_name }}' method="POST" action="{{ url_for('portfolios.update_member', portfolio_id=portfolio.id, portfolio_role_id=member.role_id) }}">
|
||||||
{{ member.update_invite_form.csrf_token }}
|
{{ member.form.csrf_token }}
|
||||||
{{ member_form.SubmitStep(
|
{{ member_form.SubmitStep(
|
||||||
name=resend_invite_modal,
|
name=modal_name,
|
||||||
form=member_form_fields.InfoFields(member.update_invite_form.user_data),
|
form=member_form_fields.PermsFields(member.form, member_role_id=member.role_id),
|
||||||
submit_text="Resend Invite",
|
submit_text="Save Changes",
|
||||||
previous=False,
|
previous=False,
|
||||||
modal=resend_invite_modal
|
modal=modal_name,
|
||||||
) }}
|
) }}
|
||||||
</form>
|
</form>
|
||||||
</base-form>
|
</base-form>
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
|
||||||
{% set revoke_invite_modal = "revoke_invite-{}".format(member.role_id) %}
|
{% if invite_pending or invite_expired -%}
|
||||||
{% call Modal(name=revoke_invite_modal) %}
|
{% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
|
||||||
<form method="post" action="{{ url_for('portfolios.revoke_invitation', portfolio_id=portfolio.id, portfolio_token=member.invite_token) }}">
|
{% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
|
||||||
{{ member.form.csrf_token }}
|
<div class="modal__form--header">
|
||||||
<h1>{{ "invites.revoke" | translate }}</h1>
|
<h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
|
||||||
<hr class="full-width">
|
|
||||||
{{ "invites.revoke_modal_text" | translate({"application": portfolio.name}) }}
|
|
||||||
<div class="action-group">
|
|
||||||
<button class="action-group__action usa-button usa-button-primary" type="submit">{{ "invites.revoke" | translate }}</button>
|
|
||||||
<button class='action-group__action usa-button usa-button-secondary' v-on:click='closeModal("{{revoke_invite_modal}}")' type="button">{{ "common.cancel" | translate }}</button>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
<base-form inline-template :enable-save="true">
|
||||||
{% endcall %}
|
<form id='{{ resend_invite_modal }}' method="POST" action="{{ url_for('portfolios.resend_invitation', portfolio_id=portfolio.id, portfolio_token=member.invite_token) }}">
|
||||||
{% else %}
|
{{ member.update_invite_form.csrf_token }}
|
||||||
{% set remove_manager_modal = "remove_manager-{}".format(member.role_id) %}
|
{{ member_form.SubmitStep(
|
||||||
{% call Modal(name=remove_manager_modal, dismissable=False) %}
|
name=resend_invite_modal,
|
||||||
<h1>{{ "portfolios.admin.alert_header" | translate }}</h1>
|
form=member_form_fields.InfoFields(member.update_invite_form.user_data),
|
||||||
<hr class="full-width">
|
submit_text="Resend Invite",
|
||||||
{{
|
previous=False,
|
||||||
Alert(
|
modal=resend_invite_modal
|
||||||
title="portfolios.admin.alert_title" | translate,
|
) }}
|
||||||
message="portfolios.admin.alert_message" | translate,
|
</form>
|
||||||
level="warning"
|
</base-form>
|
||||||
)
|
{% endcall %}
|
||||||
}}
|
|
||||||
<div class="action-group">
|
{% set revoke_invite_modal = "revoke_invite-{}".format(member.role_id) %}
|
||||||
<form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, portfolio_role_id=member.role_id)}}">
|
{% call Modal(name=revoke_invite_modal) %}
|
||||||
|
<form method="post" action="{{ url_for('portfolios.revoke_invitation', portfolio_id=portfolio.id, portfolio_token=member.invite_token) }}">
|
||||||
{{ member.form.csrf_token }}
|
{{ member.form.csrf_token }}
|
||||||
<button class="usa-button usa-button-danger">
|
<h1>{{ "invites.revoke" | translate }}</h1>
|
||||||
{{ "portfolios.members.archive_button" | translate }}
|
<hr class="full-width">
|
||||||
</button>
|
{{ "invites.revoke_modal_text" | translate({"application": portfolio.name}) }}
|
||||||
|
<div class="action-group">
|
||||||
|
<button class="action-group__action usa-button usa-button-primary" type="submit">{{ "invites.revoke" | translate }}</button>
|
||||||
|
<button class='action-group__action usa-button usa-button-secondary' v-on:click='closeModal("{{revoke_invite_modal}}")' type="button">{{ "common.cancel" | translate }}</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<a v-on:click="closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
|
{% endcall %}
|
||||||
</div>
|
{% else %}
|
||||||
{% endcall %}
|
{% set remove_manager_modal = "remove_manager-{}".format(member.role_id) %}
|
||||||
|
{% call Modal(name=remove_manager_modal, dismissable=False) %}
|
||||||
|
<h1>{{ "portfolios.admin.alert_header" | translate }}</h1>
|
||||||
|
<hr class="full-width">
|
||||||
|
{{
|
||||||
|
Alert(
|
||||||
|
title="portfolios.admin.alert_title" | translate,
|
||||||
|
message="portfolios.admin.alert_message" | translate,
|
||||||
|
level="warning"
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
<div class="action-group">
|
||||||
|
<form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, portfolio_role_id=member.role_id)}}">
|
||||||
|
{{ member.form.csrf_token }}
|
||||||
|
<button class="usa-button usa-button-danger">
|
||||||
|
{{ "portfolios.members.archive_button" | translate }}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
<a v-on:click="closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
|
||||||
|
</div>
|
||||||
|
{% endcall %}
|
||||||
|
{%- endif %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
@ -130,7 +132,11 @@
|
|||||||
{%-endfor %}
|
{%-endfor %}
|
||||||
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
||||||
{% call ToggleMenu() %}
|
{% call ToggleMenu() %}
|
||||||
<a v-on:click="openModal('{{ perms_modal }}')">Edit Permissions</a>
|
<a
|
||||||
|
{% if not member.ppoc %}v-on:click="openModal('{{ perms_modal }}')"{% endif %}
|
||||||
|
class="{% if member.ppoc %}disabled{% endif %}">
|
||||||
|
Edit Permissions
|
||||||
|
</a>
|
||||||
{% if invite_pending or invite_expired -%}
|
{% if invite_pending or invite_expired -%}
|
||||||
<a v-on:click="openModal('{{ resend_invite_modal }}')">Resend Invite</a>
|
<a v-on:click="openModal('{{ resend_invite_modal }}')">Resend Invite</a>
|
||||||
<a v-on:click="openModal('{{ revoke_invite_modal }}')">Revoke Invite</a>
|
<a v-on:click="openModal('{{ revoke_invite_modal }}')">Revoke Invite</a>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user