global activity feed

This commit is contained in:
Kyle Drake 2015-02-14 13:16:46 -08:00
parent 8fba5e7a9b
commit d53b6584d5
3 changed files with 38 additions and 27 deletions

View file

@ -13,6 +13,8 @@ get '/?' do
event = Event.select(:id).where(id: params[:event_id]).first
not_found if event.nil?
events_dataset = Event.where(id: params[:event_id]).paginate(1, 1)
elsif params[:activity] == 'global'
events_dataset = Event.select_all(:events).order(:created_at.desc).paginate(@current_page, 100).join_table(:inner, :sites, id: :site_id).where{views > 1500}.or(site_change_id: nil)
else
events_dataset = current_site.news_feed(@current_page, 10)
end
@ -62,4 +64,4 @@ end
get '/press' do
erb :'press'
end
end