Download as
Browse Code »

Commit 837972650c6d33ad4c376cb219289202559d0e48

Authored by Dmitriy Zaporozhets
2 parents 4083d01a 19560a4b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Fix displaying events for deleted things on the dashboard (again)
Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
app/helpers/events_helper.rb
  Diff comments   View file @8379726
1 1 module EventsHelper
2 2 def link_to_author(event)
3 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 6 if tm
7 7 link_to event.author_name, project_team_member_path(project, tm)
... ...
app/views/events/event/_common.html.haml
  Diff comments   View file @8379726
1 1 .event-title
2 2 %span.author_name= link_to_author event
3 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 8 %strong= truncate event.target_title
6 9 at
7   - = link_to_project event.project
  10 + - if event.project
  11 + = link_to_project event.project
  12 + - else
  13 + = event.project_name
... ...