From 0b6fc072ea959e48ce31b704f929d0b5478875a2 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 16 Sep 2019 15:58:37 -0400 Subject: [PATCH 1/4] Add invite links and tag for pending invite --- atst/routes/applications/settings.py | 1 + .../portfolios/applications/settings.html | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) 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/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 1c1957b0..ff5a88d1 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -121,12 +121,21 @@ 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 +146,16 @@ {{ env.environment_name }}{% if not env == member.environment_roles[-1]%},{% endif %} {% endfor %} + + {% if member.role_status == 'pending' %} +

+ Resend Invite +

+

+ Revoke Invite +

+ {% endif %} + {% endfor %} From 2d83a46632e783a404a01bb4ddba6d3e3a01bd7b Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 16 Sep 2019 16:12:37 -0400 Subject: [PATCH 2/4] Add link for DoD ID info --- templates/fragments/applications/new_member_modal_content.html | 1 + 1 file changed, 1 insertion(+) 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) %} From b041a31fa3594d4e40be0456cc58d6344a414e3f Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 16 Sep 2019 16:10:16 -0400 Subject: [PATCH 3/4] Fake the processing tag for envs with the name 'QA' --- .../portfolios/applications/settings.html | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index ff5a88d1..cc6d894e 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -194,6 +194,7 @@
    {% for env in environments_obj %} {% set edit_form = env['edit_form'] %} + {% set testing_env_name = 'qa' %}
  • @@ -202,19 +203,24 @@ {{ env['name'] }} - - {% set edit_environment_button %} - {{ Icon('edit') }} - {% endset %} + {% if env['name'].lower() == testing_env_name %} + PROCESSING + {% endif %} + {% if env['name'].lower() != testing_env_name %} + + {% set edit_environment_button %} + {{ Icon('edit') }} + {% endset %} - {{ - ToggleButton( - open_html=edit_environment_button, - close_html=edit_environment_button, - section_name="edit" - ) - }} - + {{ + ToggleButton( + open_html=edit_environment_button, + close_html=edit_environment_button, + section_name="edit" + ) + }} + + {% endif %} {% set members_button = "portfolios.applications.member_count" | translate({'count': env['member_count']}) %} {{ @@ -228,9 +234,13 @@
    - - {{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }} - + {% if env['name'].lower() == testing_env_name %} + Cloud service provider link unavailable + {% else %} + + {{ "portfolios.applications.csp_link" | translate }} {{ Icon('link', classes="icon--tiny") }} + + {% endif %}
    From 15a844fa8033e5909ff84e44c72c8388cfad3dd5 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 17 Sep 2019 09:53:26 -0400 Subject: [PATCH 4/4] Fix html --- templates/portfolios/applications/settings.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index cc6d894e..7b54a709 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -128,9 +128,7 @@ {% for member in members %} -

    - {{ member.user_name }} -

    + {{ member.user_name }}
    {% if member.role_status == 'pending' %} INVITE PENDING {% endif %} @@ -148,12 +146,8 @@ {% if member.role_status == 'pending' %} -

    - Resend Invite -

    -

    - Revoke Invite -

    + Resend Invite
    + Revoke Invite {% endif %}