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

Dashboard issues/mr pages improved

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-08 00:18:32 +03:00
parent 88974b500f
commit 667edcdd75
4 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/dashboard_controller.rb
View file

@ -19,15 +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").limit(40)
@merge_requests = current_user.cared_merge_requests.order("created_at DESC").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").limit(40)
@issues = current_user.assigned_issues.opened.order("created_at DESC").page(params[:page]).per(20)
@issues = @issues.includes(:author, :project)
respond_to do |format|