diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index ecf43845..c80c9d10 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -121,6 +121,7 @@ def get_members_data(application): "user_name": member.user_name, "permission_sets": permission_sets, "environment_roles": environment_roles, + "role_status": member.status.value, } ) diff --git a/templates/fragments/applications/new_member_modal_content.html b/templates/fragments/applications/new_member_modal_content.html index 9d32984e..97c84b85 100644 --- a/templates/fragments/applications/new_member_modal_content.html +++ b/templates/fragments/applications/new_member_modal_content.html @@ -50,6 +50,7 @@
{{ TextInput(new_member_form.user_data.dod_id, validation='dodId', optional=False) }}
+ How do I find the DoD ID? {% endcall %} {% endmacro %} {% macro MemberStepTwo(new_member_form, application) %} diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 1c1957b0..7b54a709 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -121,12 +121,19 @@ Member Project Permissions Environment Access + {% for member in members %} - {{ member.user_name }} + + {{ member.user_name }}
+ {% if member.role_status == 'pending' %} + INVITE PENDING + {% endif %} + + {% for perm, value in member.permission_sets.items() %} {{ ("portfolios.applications.members.{}.{}".format(perm, value)) | translate }}
@@ -137,6 +144,12 @@ {{ env.environment_name }}{% if not env == member.environment_roles[-1]%},{% endif %} {% endfor %} + + {% if member.role_status == 'pending' %} + Resend Invite
+ Revoke Invite + {% endif %} + {% endfor %} @@ -175,6 +188,7 @@