deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Context refactoring. Move Issues list, Search logic to context

Browse source
This commit is contained in:
randx 2012-10-09 22:09:46 +03:00
parent 63fe042d97
commit 679d0d6d76
15 changed files with 100 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/dashboard_controller.rb
View file

@ -6,7 +6,7 @@ class DashboardController < ApplicationController
@projects = current_user.projects_with_events
@projects = @projects.page(params[:page]).per(20)
@events = Event.recent_for_user(current_user).limit(20).offset(params[:offset] || 0)
@events = Event.in_projects(current_user.project_ids).limit(20).offset(params[:offset] || 0)
@last_push = current_user.recent_push
respond_to do |format|
@ -19,14 +19,14 @@ class DashboardController < ApplicationController
# Get authored or assigned open merge requests
def merge_requests
@projects = current_user.projects.all
@merge_requests = current_user.cared_merge_requests.order("created_at DESC").page(params[:page]).per(20)
@merge_requests = current_user.cared_merge_requests.recent.page(params[:page]).per(20)
end
# Get only assigned issues
def issues
@projects = current_user.projects.all
@user = current_user
@issues = current_user.assigned_issues.opened.order("created_at DESC").page(params[:page]).per(20)
@issues = current_user.assigned_issues.opened.recent.page(params[:page]).per(20)
@issues = @issues.includes(:author, :project)
respond_to do |format|