improvements to pagination

This commit is contained in:
Kyle Drake 2016-01-06 14:46:57 -08:00
parent 7714dc7c53
commit 32b4fe0d49
9 changed files with 38 additions and 69 deletions

View file

@ -6,23 +6,23 @@ get '/?' do
@suggestions = current_site.suggestions
@current_page = params[:current_page].to_i
@current_page = 1 if @current_page == 0
@page = params[:page].to_i
@page = 1 if @page == 0
if params[:activity] == 'mine'
events_dataset = current_site.latest_events(@current_page, 10)
events_dataset = current_site.latest_events(@page, 10)
elsif params[:event_id]
event = Event.select(:id).where(id: params[:event_id]).first
not_found if event.nil?
not_found if event.is_deleted
events_dataset = Event.where(id: params[:event_id]).paginate(1, 1)
elsif params[:activity] == 'global'
events_dataset = Event.global_dataset @current_page
events_dataset = Event.global_dataset @page
else
events_dataset = current_site.news_feed(@current_page, 10)
events_dataset = current_site.news_feed(@page, 10)
end
@page_count = events_dataset.page_count || 1
@pagination_dataset = events_dataset
@events = events_dataset.all
current_site.events_dataset.update notification_seen: true