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

Update app member status labels to accurately reflect member's current status

Browse Source
This commit is contained in:
leigh-mil
2019-11-18 16:43:53 -05:00
parent 3f146c7da8
commit 9f90f5abbd
9 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
templates/applications/fragments/members.html
View File

@@ -52,7 +52,7 @@
</base-form>
{% endcall %}
{%- if member.role_status == 'pending' %}
{%- if member.role_status == 'pending' or member.role_status == '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">
@@ -73,7 +73,7 @@
{% endif -%}
{% endif -%}
{% if user_can(permissions.DELETE_APPLICATION_MEMBER) and member.role_status == 'pending' -%}
{% if user_can(permissions.DELETE_APPLICATION_MEMBER) and (member.role_status == 'pending' or member.role_status == 'expired') -%}
{% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
{% call Modal(name=revoke_invite_modal) %}
<form method="post" action="{{ url_for('applications.revoke_invite', application_id=application.id, application_role_id=member.role_id) }}">
@@ -107,11 +107,10 @@
<tr>
<td>
<strong>{{ member.user_name }}</strong>
{% if member.role_status == 'pending' %}
<br>
{{ Label('envelope', 'invite pending', 'success', classes='label--below') }}
{% endif %}
<br>
{% if label_info[member.role_status] -%}
{{ Label(classes='label--below', **label_info[member.role_status]) }}
{%- endif %}
</td>
<td>
@@ -148,10 +147,10 @@
)
}}
{% call ToggleSection(section_name=section, classes="app-member-menu__toggle") %}
<a v-on:click="openModal('{{ perms_modal }}')">
{{ "portfolios.applications.members.menu.edit" | translate }}
</a>
{% if member.role_status == 'pending' -%}
<a v-on:click="openModal('{{ perms_modal }}')">
{{ "portfolios.applications.members.menu.edit" | translate }}
</a>
{% if member.role_status == 'pending' or member.role_status == 'expired' -%}
{% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
{% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
<a v-on:click='openModal("{{ resend_invite_modal }}")'>

4
templates/components/label.html
View File

@@ -1,8 +1,8 @@
{% from "components/icon.html" import Icon %}
{% macro Label(icon_name, text, type=None, classes="") -%}
{% macro Label(icon, text, type=None, classes="") -%}
<span class='label {% if type %}label--{{ type }}{% endif %} {{ classes }}'>
{{ Icon(icon_name) }} {{ text }}
{{ Icon(icon) }} {{ text }}
</span>
{%- endmacro %}