fix pagination

This commit is contained in:
Kyle Drake 2014-09-15 03:15:25 -07:00
parent 3e54d15cea
commit df4cf8a3d6

5
app.rb
View file

@ -50,7 +50,7 @@ error do
}) })
if @api if @api
api_error 500, 'server_error', 'there has been an unknown server error, please try again later', 500 api_error 500, 'server_error', 'there has been an unknown server error, please try again later'
end end
erb :'error' erb :'error'
@ -373,7 +373,7 @@ get '/browse/?' do
@current_page = @current_page.to_i @current_page = @current_page.to_i
@current_page = 1 if @current_page == 0 @current_page = 1 if @current_page == 0
site_dataset = Site.filter(is_banned: false, is_crashing: false).filter(site_changed: true).paginate(@current_page, 300) site_dataset = Site.filter(is_banned: false, is_crashing: false).filter(site_changed: true)
if current_site if current_site
if !current_site.blocking_site_ids.empty? if !current_site.blocking_site_ids.empty?
@ -410,6 +410,7 @@ get '/browse/?' do
site_dataset.where! ['tags.name = ?', params[:tag]] site_dataset.where! ['tags.name = ?', params[:tag]]
end end
site_dataset = site_dataset.paginate @current_page, 300
@page_count = site_dataset.page_count || 1 @page_count = site_dataset.page_count || 1
@sites = site_dataset.all @sites = site_dataset.all
erb :browse erb :browse