Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #2539 - search pagination broken in users_controller.rb

Browse source
This commit is contained in:
Billy Zhou 2019-04-16 11:14:19 +02:00 committed by Thorsten Eckel
parent 9373a42944
commit 3c5d274575
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users_controller.rb
View file

@ -405,12 +405,6 @@ class UsersController < ApplicationController
# do query # do query
user_all = User.search(query_params) user_all = User.search(query_params)
# do pagination if needed
if params[:page] && params[:per_page]
offset = (params[:page].to_i - 1) * params[:per_page].to_i
user_all = user_all[offset, params[:per_page].to_i] || []
end
if response_expand? if response_expand?
list = [] list = []
user_all.each do |user| user_all.each do |user|

11
spec/requests/user_spec.rb
View file

@ -444,6 +444,17 @@ RSpec.describe 'User', type: :request, searchindex: true do
expect(json_response[0]['role_ids']).to be_falsey expect(json_response[0]['role_ids']).to be_falsey
expect(json_response[0]['roles']).to be_falsey expect(json_response[0]['roles']).to be_falsey
# Regression test for issue #2539 - search pagination broken in users_controller.rb
# Get the total number of users N, then search with one result per page, so there should N pages with one result each
get '/api/v1/users/search', params: { query: '*' }, as: :json
total_user_number = json_response.count
(1..total_user_number).each do |i|
get '/api/v1/users/search', params: { query: '*', per_page: 1, page: i }, as: :json
expect(response).to have_http_status(200)
expect(json_response).to be_a_kind_of(Array)
expect(json_response.count).to eq(1), "Page #{i}/#{total_user_number} of the user search pagination test have the wrong result!"
end
role = Role.find_by(name: 'Agent') role = Role.find_by(name: 'Agent')
get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&role_ids=#{role.id}&label=true", params: {}, as: :json get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&role_ids=#{role.id}&label=true", params: {}, as: :json
expect(response).to have_http_status(200) expect(response).to have_http_status(200)