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

Dashboard tabs restyle, messages if no issue or merge request

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-15 09:22:24 +02:00
parent ed3f3a0d4d
commit 42c46f3720
5 changed files with 65 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/dashboard_controller.rb
View file

@ -11,9 +11,10 @@ class DashboardController < ApplicationController
end
end
# Get authored or assigned open merge requests
def merge_requests
@projects = current_user.projects.all
@merge_requests = current_user.assigned_merge_requests.order("created_at DESC").limit(40)
@merge_requests = MergeRequest.where("author_id = :id or assignee_id = :id", :id => current_user.id).opened.order("created_at DESC").limit(40)
respond_to do |format|
format.html
@ -21,6 +22,7 @@ class DashboardController < ApplicationController
end
end
# Get only assigned issues
def issues
@projects = current_user.projects.all
@user = current_user