Browse Source

Only adjust query param if searched

pull/600/head
baarkerlounger 3 years ago
parent
commit
3bd4092d25
  1. 1
      app/controllers/organisations_controller.rb
  2. 1
      app/controllers/users_controller.rb
  3. 6
      app/views/users/index.html.erb

1
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

1
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

6
app/views/users/index.html.erb

@ -29,7 +29,11 @@
<%= govuk_table do |table| %>
<%= table.caption(size: "s", classes: %w[govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4]) do |caption| %>
<span class="govuk-!-margin-right-4">
<strong><span style="font-weight: normal"> Matches </span><%= @pagy.count %><span style="font-weight: normal"> of </span><%= User.count %> <span style="font-weight: normal"> total users</strong> </span>
<% if @searched %>
<strong><span style="font-weight: normal"> Matches </span><%= @pagy.count %><span style="font-weight: normal"> of </span><%= User.count %> <span style="font-weight: normal"> total users</strong></span>
<% else %>
<strong><%= @pagy.count %></strong><span style="font-weight: normal"> total users</span>
<% end %>
</span>
<% if current_user.support? %>
<%= govuk_link_to "Download (CSV)", "/users.csv", type: "text/csv" %>

Loading…
Cancel
Save