VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-20 14:11:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix event loading with associations

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-02-18 09:38:46 -08:00
parent a6070074bc
commit 63f11a68c5
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/dashboard_controller.rb
View File

@ -22,13 +22,14 @@ class DashboardController < ApplicationController
format.html
format.json do
@events = Event.in_projects(current_user.authorized_projects.pluck(:id))
@events = @event_filter.apply_filter(@events).includes(:target, project: :namespace)
@events = @events.limit(20).offset(params[:offset] || 0)
load_events
pager_json("events/_events", @events.count)
end
format.atom { render layout: false }
format.atom do
load_events
render layout: false
end
end
end
@ -77,4 +78,10 @@ class DashboardController < ApplicationController
def load_projects
@projects = current_user.authorized_projects.sorted_by_activity.non_archived
end
def load_events
@events = Event.in_projects(current_user.authorized_projects.pluck(:id))
@events = @event_filter.apply_filter(@events).with_associations
@events = @events.limit(20).offset(params[:offset] || 0)
end
end