github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:31:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: groups pagination was broken

Browse Source
This commit is contained in:
Régis Hanol
2020-01-16 23:57:34 +01:00
parent 0c4ac2a7bc
commit 7b83237261
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/groups_controller.rb
View File

@ -80,6 +80,9 @@ class GroupsController < ApplicationController
type_filters = type_filters - [:my, :owner]
end
# count the total before doing pagination
total = groups.count
page = params[:page].to_i
page_size = MobileDetection.mobile_device?(request.user_agent) ? 15 : 36
groups = groups.offset(page * page_size).limit(page_size)
@ -93,14 +96,14 @@ class GroupsController < ApplicationController
extras: {
type_filters: type_filters
},
total_rows_groups: groups.count,
total_rows_groups: total,
load_more_groups: groups_path(
page: page + 1,
type: type,
order: order,
asc: params[:asc],
filter: filter
),
)
)
end