Download as
Browse Code »

Commit 5058c4fdcf51e3040121ecc822a6f856e7f4537d

Authored by Dmitriy Zaporozhets
1 parent 59241299
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix wall notes event trying to render target

Showing 2 changed files with 16 additions and 2 deletions   Show diff stats
app/roles/note_event.rb
  Diff comments   View file @5058c4f
... ... @@ -18,4 +18,16 @@ module NoteEvent
18 18 def note_target_id
19 19 target.noteable_id
20 20 end
  21 +
  22 + def wall_note?
  23 + target.noteable_type.blank?
  24 + end
  25 +
  26 + def note_target_type
  27 + if target.noteable_type.present?
  28 + target.noteable_type.titleize
  29 + else
  30 + "Wall"
  31 + end.downcase
  32 + end
21 33 end
... ...
app/views/events/event/_note.html.haml
  Diff comments   View file @5058c4f
1 1 .event-title
2 2 %span.author_name= link_to_author event
3   - %span.event_label commented on #{event.target.noteable_type_name}
4   - - if event.target and event.note_target
  3 + %span.event_label commented on #{event.note_target_type}
  4 + - if event.note_target
5 5 - if event.note_commit?
6 6 = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
7 7 - else
8 8 = link_to [event.project, event.note_target] do
9 9 %strong= truncate event.note_target_id
10 10  
  11 + - elsif event.wall_note?
  12 + -# nothing here
11 13 - else
12 14 %strong (deleted)
13 15 at
... ...