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

Merge pull request #1683 from riyad/fix-events-for-deleted-things-again

Browse source 
Fix displaying events for deleted things on the dashboard (again)
This commit is contained in:
Dmitriy Zaporozhets 2012-10-12 04:56:16 -07:00
commit 837972650c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/events_helper.rb
View file

@ -1,7 +1,7 @@
module EventsHelper module EventsHelper
def link_to_author(event) def link_to_author(event)
project = event.project project = event.project
tm = project.team_member_by_id(event.author_id) tm = project.team_member_by_id(event.author_id) if project
if tm if tm
link_to event.author_name, project_team_member_path(project, tm) link_to event.author_name, project_team_member_path(project, tm)

10
app/views/events/event/_common.html.haml
View file

@ -1,7 +1,13 @@
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
%span.event_label{class: event.action_name}= event_action_name(event) %span.event_label{class: event.action_name}= event_action_name(event)
= link_to [event.project, event.target] do - if event.target
= link_to [event.project, event.target] do
%strong= truncate event.target_title
- else
%strong= truncate event.target_title %strong= truncate event.target_title
at at
= link_to_project event.project - if event.project
= link_to_project event.project
- else
= event.project_name