Fix gallery index pagination bug.

This commit is contained in:
BoHung Chiu 2022-03-05 23:11:48 +08:00
parent f9760abc02
commit 2f01d2a5d4
1 changed files with 4 additions and 1 deletions

View File

@ -147,7 +147,10 @@ class GalleriesController < ApplicationController
end end
else else
albums_with_order = [] albums_with_order = []
start_index = (page_data_count - (with_order_count % page_data_count) + page_data_count*(page_no - 1 - with_order_total_pages)) start_index = page_data_count*(page_no - 1 - with_order_total_pages)
if with_order_count != 0
start_index += (page_data_count - (with_order_count % page_data_count))
end
albums_no_order = album_tp.desc(:created_at).where(:order.in=>[-1,nil]).page(nil).per(all_count)[start_index...(start_index+page_data_count)].to_a albums_no_order = album_tp.desc(:created_at).where(:order.in=>[-1,nil]).page(nil).per(all_count)[start_index...(start_index+page_data_count)].to_a
end end
albums = albums_with_order.concat(albums_no_order) albums = albums_with_order.concat(albums_no_order)