cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add search form to the top of the user list view

Browse source
This commit is contained in:
Tom Hughes 2025-02-15 14:21:35 +00:00
parent 30fe6c5b86
commit 4ea868ace7
4 changed files with 82 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users/lists_controller.rb
View file

@ -16,8 +16,8 @@ module Users
@params = params.permit(:status, :ip, :before, :after) @params = params.permit(:status, :ip, :before, :after)
users = User.all users = User.all
users = users.where(:status => @params[:status]) if @params[:status] users = users.where(:status => @params[:status]) if @params[:status].present?
users = users.where(:creation_address => @params[:ip]) if @params[:ip] users = users.where(:creation_address => @params[:ip]) if @params[:ip].present?
@users_count = users.limit(501).count @users_count = users.limit(501).count
@users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500 @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500

90
app/views/users/lists/_page.html.erb
View file

@ -1,48 +1,52 @@
<turbo-frame id="pagination" target="_top" data-turbo="false"> <turbo-frame id="pagination" target="_top" data-turbo="false">
<%= form_tag @params, :method => :put do %> <% unless @users.empty? %>
<div class="row"> <%= form_tag @params, :method => :put do %>
<div class="col"> <div class="row">
<%= render "shared/pagination", <div class="col">
:translation_scope => "shared.pagination.users", <%= render "shared/pagination",
:newer_id => @newer_users_id, :translation_scope => "shared.pagination.users",
:older_id => @older_users_id %> :newer_id => @newer_users_id,
</div> :older_id => @older_users_id %>
<div class="col col-auto"> </div>
<%= t ".found_users", :count => @users_count %> <div class="col col-auto">
</div> <%= t ".found_users", :count => @users_count %>
<div> </div>
<div>
<%= hidden_field_tag :status, params[:status] if params[:status] %> <%= hidden_field_tag :status, params[:status] if params[:status] %>
<%= hidden_field_tag :ip, params[:ip] if params[:ip] %> <%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
<%= hidden_field_tag :page, params[:page] if params[:page] %> <%= hidden_field_tag :page, params[:page] if params[:page] %>
<table id="user_list" class="table table-borderless table-striped"> <table id="user_list" class="table table-borderless table-striped">
<thead> <thead>
<tr> <tr>
<td colspan="2"> <td colspan="2">
</td> </td>
<td> <td>
<%= check_box_tag "user_all", "1", false %> <%= check_box_tag "user_all", "1", false %>
</td> </td>
</tr> </tr>
</thead> </thead>
<%= render :partial => "user", :collection => @users %> <%= render :partial => "user", :collection => @users %>
</table> </table>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<%= render "shared/pagination", <%= render "shared/pagination",
:translation_scope => "shared.pagination.users", :translation_scope => "shared.pagination.users",
:newer_id => @newer_users_id, :newer_id => @newer_users_id,
:older_id => @older_users_id %> :older_id => @older_users_id %>
</div> </div>
<div class="col col-auto"> <div class="col col-auto">
<%= t ".found_users", :count => @users_count %> <%= t ".found_users", :count => @users_count %>
</div> </div>
<div> <div>
<div> <div>
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %> <%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
<%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %> <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>
</div> </div>
<% end %> <% end %>
<% else -%>
<p><%= t ".empty" %></p>
<% end -%>
</turbo-frame> </turbo-frame>

28
app/views/users/lists/show.html.erb
View file

@ -8,8 +8,26 @@
<h1><%= t(".heading") %></h1> <h1><%= t(".heading") %></h1>
<% end %> <% end %>
<% unless @users.empty? %> <%= form_tag(users_list_path, :method => :get, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" }) do %>
<%= render :partial => "page" %> <div class="row gx-1">
<% else %> <div class="mb-3 col-md-auto">
<p><%= t ".empty" %></p> <%= select_tag :status,
<% end %> options_for_select(User.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
:include_blank => t(".select_status"),
:data => { :behavior => "category_dropdown" },
:class => "form-select" %>
</div>
<div class="mb-3 col-md">
<%= text_field_tag :ip,
params[:ip],
:placeholder => t(".ip_address"),
:autocomplete => "on",
:class => "form-control" %>
</div>
<div class="mb-3 col-md-auto">
<%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
</div>
</div>
<% end -%>
<%= render :partial => "page" %>

11
config/locales/en.yml
View file

@ -2882,13 +2882,22 @@ en:
show: show:
title: Users title: Users
heading: Users heading: Users
empty: No matching users found select_status: Select Status
states:
pending: Pending
active: Active
confirmed: Confirmed
suspended: Suspended
deleted: Deleted
ip_address: IP Address
search: Search
page: page:
found_users: found_users:
one: "%{count} user found" one: "%{count} user found"
other: "%{count} users found" other: "%{count} users found"
confirm: Confirm Selected Users confirm: Confirm Selected Users
hide: Hide Selected Users hide: Hide Selected Users
empty: No matching users found
user: user:
summary_html: "%{name} created from %{ip_address} on %{date}" summary_html: "%{name} created from %{ip_address} on %{date}"
summary_no_ip_html: "%{name} created on %{date}" summary_no_ip_html: "%{name} created on %{date}"