diff --git a/app/main/forms.py b/app/main/forms.py index 3ec7e33a8..c7dd469c4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -735,6 +735,11 @@ class SearchTemplatesForm(StripWhitespaceForm): search = SearchField('Search by name') +class SearchUsersForm(StripWhitespaceForm): + + search = SearchField('Search by name or email address') + + class SearchNotificationsForm(StripWhitespaceForm): to = SearchField('Search by phone number or email address') diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 8f20f1375..de5bf3ec2 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -17,7 +17,8 @@ from notifications_python_client.errors import HTTPError from app.main import main from app.main.forms import ( InviteUserForm, - PermissionsForm + PermissionsForm, + SearchUsersForm, ) from app import (user_api_client, current_service, service_api_client, invite_api_client) from app.notify_client.models import roles @@ -40,6 +41,8 @@ def manage_users(service_id): 'views/manage-users.html', users=users, current_user=current_user, + show_search_box=(len(users) > 7), + form=SearchUsersForm(), ) diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index d8ce7da25..5a86710be 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -2,6 +2,7 @@ {% from "components/table.html" import list_table, row, field, hidden_field_heading %} {% from "components/page-footer.html" import page_footer %} {% from "components/tick-cross.html" import tick_cross %} +{% from "components/textbox.html" import textbox %} {% set table_options = { 'field_headings': [ @@ -30,6 +31,17 @@ {% endif %} + {% if show_search_box %} +
+ +
+ {% endif %} +
{% for user in users %}