Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Include user_field_ids in pagination URL for directory items (#13569)

This commit is contained in:
Mark VanLandingham 2021-06-29 14:43:38 -05:00 committed by GitHub
parent 1f74ea0f08
commit 4b27de8c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/directory_items_controller.rb
View File

@ -75,7 +75,7 @@ class DirectoryItemsController < ApplicationController
result_count = result.count
result = result.limit(PAGE_SIZE).offset(PAGE_SIZE * page).to_a
more_params = params.slice(:period, :order, :asc, :group).permit!
more_params = params.slice(:period, :order, :asc, :group, :user_field_ids).permit!
more_params[:page] = page + 1
load_more_uri = URI.parse(directory_items_path(more_params))
load_more_directory_items_json = "#{load_more_uri.path}.json?#{load_more_uri.query}"

3
spec/requests/directory_items_controller_spec.rb
View File

@ -54,11 +54,12 @@ describe DirectoryItemsController do
end
it "respects more_params in load_more_directory_items" do
get '/directory_items.json', params: { period: 'all', order: "likes_given", group: group.name }
get '/directory_items.json', params: { period: 'all', order: "likes_given", group: group.name, user_field_ids: "1|2" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json['meta']['load_more_directory_items']).to include("group=#{group.name}")
expect(json['meta']['load_more_directory_items']).to include("user_field_ids=#{CGI.escape('1|2')}")
expect(json['meta']['load_more_directory_items']).to include("order=likes_given")
expect(json['meta']['load_more_directory_items']).to include("period=all")
end