From 9f8e4fd60a7daeb5fdc4623102eed7131b9f52ca Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 26 Mar 2024 04:27:55 +0300 Subject: [PATCH] Use before/after pagination on users page --- app/controllers/users_controller.rb | 14 +++++------- app/views/users/index.html.erb | 21 ++++++++++-------- config/locales/en.yml | 5 ++--- test/controllers/users_controller_test.rb | 27 ++++++++++++++++++++--- 4 files changed, 44 insertions(+), 23 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fbf49ecbe..b9f1af807 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,6 +2,7 @@ class UsersController < ApplicationController include EmailMethods include SessionMethods include UserMethods + include PaginationMethods layout "site" @@ -29,16 +30,13 @@ class UsersController < ApplicationController redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page]) else - @params = params.permit(:status, :ip) + @params = params.permit(:status, :ip, :before, :after) - conditions = {} - conditions[:status] = @params[:status] if @params[:status] - conditions[:creation_ip] = @params[:ip] if @params[:ip] + users = User.all + users = users.where(:status => @params[:status]) if @params[:status] + users = users.where(:creation_ip => @params[:ip]) if @params[:ip] - @user_pages, @users = paginate(:users, - :conditions => conditions, - :order => :id, - :per_page => 50) + @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50) end end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 12d5ae7af..22a916c8b 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -10,6 +10,12 @@ <% 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 %> + <%= hidden_field_tag :status, params[:status] if params[:status] %> <%= hidden_field_tag :ip, params[:ip] if params[:ip] %> <%= hidden_field_tag :page, params[:page] if params[:page] %> @@ -17,15 +23,6 @@ - <%= t ".showing", - :page => @user_pages.current_page.number, - :first_item => @user_pages.current_page.first_item, - :last_item => @user_pages.current_page.last_item, - :items => @user_pages.item_count, - :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1 %> - <% if @user_pages.page_count > 1 %> - | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %> - <% end %> <%= check_box_tag "user_all", "1", false %> @@ -35,6 +32,12 @@ <%= render @users %> + <%= render "shared/pagination", + :newer_key => "users.index.newer", + :older_key => "users.index.older", + :newer_id => @newer_users_id, + :older_id => @older_users_id %> +
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %> <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 9af89978e..a173a7e4f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2832,9 +2832,8 @@ en: index: title: Users heading: Users - showing: - one: Page %{page} (%{first_item} of %{items}) - other: Page %{page} (%{first_item}-%{last_item} of %{items}) + older: "Older Users" + newer: "Newer Users" summary_html: "%{name} created from %{ip_address} on %{date}" summary_no_ip_html: "%{name} created on %{date}" confirm: Confirm Selected Users diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 4ff9e76f6..62bb34279 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -644,23 +644,44 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # 100 examples, an administrator, and a granter for the admin. assert_equal 102, User.count + next_path = users_path - get users_path + get next_path assert_response :success assert_template :index assert_select "table#user_list tbody tr", :count => 50 + check_no_page_link "Newer Users" + next_path = check_page_link "Older Users" - get users_path, :params => { :page => 2 } + get next_path assert_response :success assert_template :index assert_select "table#user_list tbody tr", :count => 50 + check_page_link "Newer Users" + next_path = check_page_link "Older Users" - get users_path, :params => { :page => 3 } + get next_path assert_response :success assert_template :index assert_select "table#user_list tbody tr", :count => 2 + check_page_link "Newer Users" + check_no_page_link "Older Users" + end + + private + + def check_no_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" end + def check_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| + return buttons.first.attributes["href"].value + end + end + + public + def test_index_post_confirm inactive_user = create(:user, :pending) suspended_user = create(:user, :suspended) -- 2.39.5