Add found users count to users page
This commit is contained in:
parent
9f8e4fd60a
commit
f0d05c20ae
3 changed files with 28 additions and 10 deletions
|
@ -36,6 +36,7 @@ class UsersController < ApplicationController
|
|||
users = users.where(:status => @params[:status]) if @params[:status]
|
||||
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)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,11 +10,18 @@
|
|||
|
||||
<% unless @users.empty? %>
|
||||
<%= form_tag do %>
|
||||
<%= render "shared/pagination",
|
||||
:newer_key => "users.index.newer",
|
||||
:older_key => "users.index.older",
|
||||
:newer_id => @newer_users_id,
|
||||
:older_id => @older_users_id %>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<%= render "shared/pagination",
|
||||
:newer_key => "users.index.newer",
|
||||
:older_key => "users.index.older",
|
||||
:newer_id => @newer_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 :ip, params[:ip] if params[:ip] %>
|
||||
|
@ -32,11 +39,18 @@
|
|||
<%= render @users %>
|
||||
</table>
|
||||
|
||||
<%= render "shared/pagination",
|
||||
:newer_key => "users.index.newer",
|
||||
:older_key => "users.index.older",
|
||||
:newer_id => @newer_users_id,
|
||||
:older_id => @older_users_id %>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<%= render "shared/pagination",
|
||||
:newer_key => "users.index.newer",
|
||||
:older_key => "users.index.older",
|
||||
:newer_id => @newer_users_id,
|
||||
:older_id => @older_users_id %>
|
||||
</div>
|
||||
<div class="col col-auto">
|
||||
<%= t ".found_users", :count => @users_count %>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
<div>
|
||||
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
|
||||
|
|
|
@ -2834,6 +2834,9 @@ en:
|
|||
heading: Users
|
||||
older: "Older Users"
|
||||
newer: "Newer Users"
|
||||
found_users:
|
||||
one: "%{count} user found"
|
||||
other: "%{count} users found"
|
||||
summary_html: "%{name} created from %{ip_address} on %{date}"
|
||||
summary_no_ip_html: "%{name} created on %{date}"
|
||||
confirm: Confirm Selected Users
|
||||
|
|
Loading…
Add table
Reference in a new issue