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

Add found users count to users page

Browse source
This commit is contained in:
Anton Khorev 2024-03-26 05:19:46 +03:00
parent 9f8e4fd60a
commit f0d05c20ae
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/users_controller.rb
View file

@ -36,6 +36,7 @@ class UsersController < ApplicationController
users = users.where(:status => @params[:status]) if @params[:status] users = users.where(:status => @params[:status]) if @params[:status]
users = users.where(:creation_ip => @params[:ip]) if @params[:ip] users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
@users_count = users.count
@users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50) @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)
end end
end end

14
app/views/users/index.html.erb
View file

@ -10,11 +10,18 @@
<% unless @users.empty? %> <% unless @users.empty? %>
<%= form_tag do %> <%= form_tag do %>
<div class="row">
<div class="col">
<%= render "shared/pagination", <%= render "shared/pagination",
:newer_key => "users.index.newer", :newer_key => "users.index.newer",
:older_key => "users.index.older", :older_key => "users.index.older",
:newer_id => @newer_users_id, :newer_id => @newer_users_id,
:older_id => @older_users_id %> :older_id => @older_users_id %>
</div>
<div class="col col-auto">
<%= t ".found_users", :count => @users_count %>
</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] %>
@ -32,11 +39,18 @@
<%= render @users %> <%= render @users %>
</table> </table>
<div class="row">
<div class="col">
<%= render "shared/pagination", <%= render "shared/pagination",
:newer_key => "users.index.newer", :newer_key => "users.index.newer",
:older_key => "users.index.older", :older_key => "users.index.older",
:newer_id => @newer_users_id, :newer_id => @newer_users_id,
:older_id => @older_users_id %> :older_id => @older_users_id %>
</div>
<div class="col col-auto">
<%= t ".found_users", :count => @users_count %>
</div>
<div>
<div> <div>
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %> <%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>

3
config/locales/en.yml
View file

@ -2834,6 +2834,9 @@ en:
heading: Users heading: Users
older: "Older Users" older: "Older Users"
newer: "Newer Users" newer: "Newer Users"
found_users:
one: "%{count} user found"
other: "%{count} users found"
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}"
confirm: Confirm Selected Users confirm: Confirm Selected Users