Download as
Browse Code »

Commit 08e52a5624f3534f3b7ad9f9c88ef2f35a8ff77a

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

Refactor event title for notes

Showing 2 changed files with 29 additions and 19 deletions   Show diff stats
app/helpers/events_helper.rb
  Diff comments   View file @08e52a5
... ... @@ -91,4 +91,32 @@ module EventsHelper
91 91 url_for([event.project, event.note_target])
92 92 end
93 93 end
  94 +
  95 + def event_note_title_html(event)
  96 + if event.note_target
  97 + if event.note_commit?
  98 + link_to project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" do
  99 + "#{event.note_target_type} #{event.note_short_commit_id}"
  100 + end
  101 + elsif event.note_project_snippet?
  102 + link_to(project_snippet_path(event.project, event.note_target)) do
  103 + content_tag :strong do
  104 + "#{event.note_target_type} ##{truncate event.note_target_id}"
  105 + end
  106 + end
  107 + else
  108 + link_to event_note_target_path(event) do
  109 + content_tag :strong do
  110 + "#{event.note_target_type} ##{truncate event.note_target_id}"
  111 + end
  112 + end
  113 + end
  114 + elsif event.wall_note?
  115 + link_to 'wall', project_wall_path(event.project)
  116 + else
  117 + content_tag :strong do
  118 + "(deleted)"
  119 + end
  120 + end
  121 + end
94 122 end
... ...
app/views/events/event/_note.html.haml
  Diff comments   View file @08e52a5
1 1 .event-title
2 2 %span.author_name= link_to_author event
3   - %span.event_label commented on
4   - - if event.note_target
5   - - if event.note_commit?
6   - = event.note_target_type
7   - = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
8   - - elsif event.note_project_snippet?
9   - = link_to project_snippet_path(event.project, event.note_target) do
10   - %strong
11   - #{event.note_target_type} ##{truncate event.note_target_id}
12   - - else
13   - = link_to event_note_target_path(event) do
14   - %strong
15   - #{event.note_target_type} ##{truncate event.note_target_id}
16   -
17   - - elsif event.wall_note?
18   - = link_to 'wall', project_wall_path(event.project)
19   - - else
20   - %strong (deleted)
21   - at
  3 + %span.event_label commented on #{event_note_title_html(event)} at
22 4 - if event.project
23 5 = link_to_project event.project
24 6 - else
... ...