diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 02de8d145..75a483cad 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -19,6 +19,7 @@ class OrganisationsController < ApplicationController def users @pagy, @users = pagy(filtered_users(@organisation.users)) + @searched = params["user-search-field"].present? render "users/index" end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0e02f2bf8..d0493a739 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -11,6 +11,7 @@ class UsersController < ApplicationController redirect_to users_organisation_path(current_user.organisation) unless current_user.support? @pagy, @users = pagy(filtered_users(User.all)) + @searched = params["user-search-field"].present? respond_to do |format| format.html diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 640b5ecb7..ab160f49c 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -29,8 +29,12 @@ <%= govuk_table do |table| %> <%= table.caption(size: "s", classes: %w[govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4]) do |caption| %> - Matches <%= @pagy.count %> of <%= User.count %> total users - + <% if @searched %> + Matches <%= @pagy.count %> of <%= User.count %> total users + <% else %> + <%= @pagy.count %> total users + <% end %> + <% if current_user.support? %> <%= govuk_link_to "Download (CSV)", "/users.csv", type: "text/csv" %> <% end %>