diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-07 18:18:11 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-10 19:12:28 +0400 |
commit | f96827c4f017d5d8114d488d352695ed03c88c0a (patch) | |
tree | c09f531bf8c71fa96ad752c78a0382ba2f74747e | |
parent | f82ec5b9f276424fe3f26c8b3bbf6b070e00243f (diff) |
Fix dashboard lost if comment on commit
-rw-r--r-- | app/helpers/events_helper.rb | 8 | ||||
-rw-r--r-- | app/views/events/event/_note.html.haml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 7155036eeed..80dcc127e7e 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -83,4 +83,12 @@ module EventsHelper render "events/event_push", event: event end end + + def event_note_target_path(event) + if event.note? && event.note_commit? + project_commit_path(event.project, event.note_target) + else + url_for([event.project, event.note_target]) + end + end end diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 8bcfa95ff62..70289b65663 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -6,7 +6,7 @@ = event.note_target_type = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" - else - = link_to [event.project, event.note_target] do + = link_to event_note_target_path(event) do %strong #{event.note_target_type} ##{truncate event.note_target_id} |