From: Tom Hughes Date: Tue, 10 Sep 2024 17:50:38 +0000 (+0100) Subject: Limit the number of users counted for users#index X-Git-Tag: live~199^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e22d19f004ee5c2db473717cc5bd57059a6203f5?hp=17bea98e199f204b22847356fc64beaa81a9373a Limit the number of users counted for users#index This view uses cursor based pagination but then undermines that by counting the total number of users so limit the effect of that but counting a maximum of ten pages of users. --- diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4ebeb1ec3..bc1baf8a5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -38,7 +38,9 @@ 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_count = users.limit(501).count + @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500 + @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50) render :partial => "page" if turbo_frame_request_id == "pagination"