github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Pagination while sorting on column headers

Browse Source
This commit is contained in:
Robin Ward
2013-11-14 12:35:18 -05:00
parent 07cbf8f4e3
commit 41dfcd2774
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/list_controller.rb
View File

@ -58,9 +58,9 @@ class ListController < ApplicationController
@description = @category.description
if params[:parent_category].present?
list.more_topics_url = url_for(category_list_parent_path(params[:parent_category], params[:category], page: next_page, format: "json"))
list.more_topics_url = url_for(category_list_parent_path(params[:parent_category], params[:category], next_page_params))
else
list.more_topics_url = url_for(category_list_path(params[:category], page: next_page, format: "json"))
list.more_topics_url = url_for(category_list_path(params[:category], next_page_params))
end
respond(list)
@ -108,8 +108,12 @@ class ListController < ApplicationController
end
end
def next_page
params[:page].to_i + 1
def next_page_params(opts=nil)
opts = opts || {}
route_params = { format: 'json', page: params[:page].to_i + 1 }
route_params[:sort_order] = opts[:sort_order] if opts[:sort_order].present?
route_params[:sort_descending] = opts[:sort_descending] if opts[:sort_descending].present?
route_params
end
private
@ -155,12 +159,11 @@ class ListController < ApplicationController
end
def generate_list_for(action, target_user, opts)
list = TopicQuery.new(current_user, opts)
list = list.send("list_#{action}", target_user)
TopicQuery.new(current_user, opts).send("list_#{action}", target_user)
end
def construct_url_with(action, opts, url_prefix=nil)
method = url_prefix.blank? ? "#{action}_path" : "#{url_prefix}_#{action}_path"
public_send(method, opts.merge(format: 'json', page: next_page))
public_send(method, opts.merge(next_page_params(opts)))
end
end