diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-12 13:37:44 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-12 13:37:44 +0200 |
| commit | 19560a4b5f8087ed0cfeef285c9a03404d15ca60 (patch) | |
| tree | 8eba4b08fba5696b6076cbb9988137ef63898ba6 | |
| parent | baf94bd732e0e5802a888d95d943c948b7a9e65b (diff) | |
| download | gitlab-ce-19560a4b5f8087ed0cfeef285c9a03404d15ca60.tar.gz | |
Fix displaying events for deleted things
| -rw-r--r-- | app/helpers/events_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/events/event/_common.html.haml | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 2c466aba4f2..0eb87caadd7 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -1,7 +1,7 @@ module EventsHelper def link_to_author(event) 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 link_to event.author_name, project_team_member_path(project, tm) diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index ffcaa81a9d8..dcabd1a95ee 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,7 +1,13 @@ .event-title %span.author_name= link_to_author 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 at - = link_to_project event.project + - if event.project + = link_to_project event.project + - else + = event.project_name |