From d35b490ee7e9fe448511890555c9174a69cb28d9 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 12 Dec 2023 15:39:16 -0500 Subject: [PATCH] Moved the button to a more obvious place on the page --- app/templates/views/manage-users.html | 27 +++++++++++------------ tests/app/main/views/test_manage_users.py | 12 ++++------ 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index bd91a2f04..f8585870e 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -9,9 +9,19 @@ {% block maincolumn_content %} -

- Team members -

+
+

+ Team members +

+ {% if current_user.has_permissions('manage_service') %} + {{ usaButton({ + "element": "a", + "text": "Invite a team member", + "href": url_for('.invite_user', service_id=current_service.id), + "classes": "usa-button--outline" + }) }} + {% endif %} +
{% if show_search_box %}
@@ -84,15 +94,4 @@ {% endfor %}
- {% if current_user.has_permissions('manage_service') %} -
- {{ usaButton({ - "element": "a", - "text": "Invite a team member", - "href": url_for('.invite_user', service_id=current_service.id), - "classes": "usa-button" - }) }} -
- {% endif %} - {% endblock %} diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index abc23b563..c5d97bd03 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -775,15 +775,11 @@ def test_should_show_page_for_inviting_user( def test_should_not_show_page_for_inviting_user_without_permissions( - client_request, - mock_get_template_folders, - active_user_empty_permissions + client_request, mock_get_template_folders, active_user_empty_permissions ): client_request.login(active_user_empty_permissions) page = client_request.get( - "main.invite_user", - service_id=SERVICE_ONE_ID, - _expected_status=403 + "main.invite_user", service_id=SERVICE_ONE_ID, _expected_status=403 ) assert "not allowed to see this page" in page.h1.string.strip() @@ -815,7 +811,7 @@ def test_should_show_page_for_inviting_user_with_email_prefilled( user_id=fake_uuid, # We have the user’s name in the H1 but don’t want it duplicated # in the page title - _test_page_title=False + _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text).startswith( "Invite a team member" @@ -830,7 +826,7 @@ def test_should_show_page_if_prefilled_user_is_already_a_team_member( mock_get_template_folders, fake_uuid, active_user_with_permissions, - active_caseworking_user + active_caseworking_user, ): client_request.login(active_user_with_permissions) mocker.patch(