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

fixed issue, mr crash if assignee/author removed from team

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-05 12:58:02 +02:00
parent 5a12bee37d
commit c90f1d5c8b
6 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/helpers/issues_helper.rb
View file

@ -9,4 +9,26 @@ module IssuesHelper
params[:f] ||= cookies['issue_filter']
project_issues_path project, params
end
def link_to_issue_assignee(issue)
project = issue.project
tm = project.team_member_by_id(issue.assignee_id)
if tm
link_to issue.assignee_name, project_team_member_path(project, tm), :class => "author_link"
else
issue.assignee_name
end
end
def link_to_issue_author(issue)
project = issue.project
tm = project.team_member_by_id(issue.author_id)
if tm
link_to issue.author_name, project_team_member_path(project, tm), :class => "author_link"
else
issue.author_name
end
end
end

21
app/helpers/merge_requests_helper.rb
View file

@ -1,2 +1,23 @@
module MergeRequestsHelper
def link_to_merge_request_assignee(merge_request)
project = merge_request.project
tm = project.team_member_by_id(merge_request.assignee_id)
if tm
link_to merge_request.assignee_name, project_team_member_path(project, tm), :class => "author_link"
else
merge_request.assignee_name
end
end
def link_to_merge_request_author(merge_request)
project = merge_request.project
tm = project.team_member_by_id(merge_request.author_id)
if tm
link_to merge_request.author_name, project_team_member_path(project, tm), :class => "author_link"
else
merge_request.author_name
end
end
end