Commit 19560a4b5f8087ed0cfeef285c9a03404d15ca60
1 parent
baf94bd7
Exists in
master
and in
4 other branches
Fix displaying events for deleted things
Showing
2 changed files
with
9 additions
and
3 deletions
Show diff stats
app/helpers/events_helper.rb
| 1 | module EventsHelper | 1 | module EventsHelper |
| 2 | def link_to_author(event) | 2 | def link_to_author(event) |
| 3 | project = event.project | 3 | project = event.project |
| 4 | - tm = project.team_member_by_id(event.author_id) | 4 | + tm = project.team_member_by_id(event.author_id) if project |
| 5 | 5 | ||
| 6 | if tm | 6 | if tm |
| 7 | link_to event.author_name, project_team_member_path(project, tm) | 7 | link_to event.author_name, project_team_member_path(project, tm) |
app/views/events/event/_common.html.haml
| 1 | .event-title | 1 | .event-title |
| 2 | %span.author_name= link_to_author event | 2 | %span.author_name= link_to_author event |
| 3 | %span.event_label{class: event.action_name}= event_action_name(event) | 3 | %span.event_label{class: event.action_name}= event_action_name(event) |
| 4 | - = link_to [event.project, event.target] do | 4 | + - if event.target |
| 5 | + = link_to [event.project, event.target] do | ||
| 6 | + %strong= truncate event.target_title | ||
| 7 | + - else | ||
| 5 | %strong= truncate event.target_title | 8 | %strong= truncate event.target_title |
| 6 | at | 9 | at |
| 7 | - = link_to_project event.project | 10 | + - if event.project |
| 11 | + = link_to_project event.project | ||
| 12 | + - else | ||
| 13 | + = event.project_name |