Fix dashboard lost if comment on commit

Dmitriy Zaporozhets
1 parent f82ec5b9
Showing 2 changed files with 9 additions and 1 deletions Show diff stats
app/helpers/events_helper.rb
app/views/events/event/_note.html.haml
@@ -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
@@ -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}
	@@ -83,4 +83,12 @@ module EventsHelper		@@ -83,4 +83,12 @@ module EventsHelper
83	render "events/event_push", event: event	83	render "events/event_push", event: event
84	end	84	end
85	end	85	end
		86	+
		87	+ def event_note_target_path(event)
		88	+ if event.note? && event.note_commit?
		89	+ project_commit_path(event.project, event.note_target)
		90	+ else
		91	+ url_for([event.project, event.note_target])
		92	+ end
		93	+ end
86	end	94	end
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	= event.note_target_type	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"	7	= link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
8	- else	8	- else
9	- = link_to [event.project, event.note_target] do	9	+ = link_to event_note_target_path(event) do
10	%strong	10	%strong
11	#{event.note_target_type} ##{truncate event.note_target_id}	11	#{event.note_target_type} ##{truncate event.note_target_id}
12		12