Commit 21a896b5 authored by Clement Ho's avatar Clement Ho

Move per_page to load_users_by_ability method

parent 41b97994
...@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController ...@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController
@users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present?
@users = @users.active @users = @users.active
@users = @users.reorder(:name) @users = @users.reorder(:name)
@users = load_users_by_ability.per(params[:per_page]) || @users.page(params[:page]).per(params[:per_page]) @users = load_users_by_ability || @users.page(params[:page]).per(params[:per_page])
if params[:todo_filter].present? && current_user if params[:todo_filter].present? && current_user
@users = @users.todo_authors(current_user.id, params[:todo_state_filter]) @users = @users.todo_authors(current_user.id, params[:todo_state_filter])
...@@ -63,7 +63,7 @@ class AutocompleteController < ApplicationController ...@@ -63,7 +63,7 @@ class AutocompleteController < ApplicationController
@users.to_a @users.to_a
.select { |user| user.can?(ability, @project) } .select { |user| user.can?(ability, @project) }
.take(Kaminari.config.default_per_page) .take(params[:per_page]&.to_i || Kaminari.config.default_per_page)
end end
def find_users def find_users
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment