deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix notes helper

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-29 15:50:30 +01:00
parent fc1c250d40
commit b91d680257
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/helpers/notes_helper.rb
View file

@ -9,16 +9,13 @@ module NotesHelper
# Helps to distinguish e.g. commit notes in mr notes list # Helps to distinguish e.g. commit notes in mr notes list
def note_for_main_target?(note) def note_for_main_target?(note)
!@mixed_targets || @main_target_type == note.noteable_type !@mixed_targets || (@main_target_type == note.noteable_type && !note.for_diff_line?)
end end
def link_to_commit_diff_line_note(note) def link_to_commit_diff_line_note(note)
commit = note.noteable if note.for_commit_diff_line?
diff_index, diff_old_line, diff_new_line = note.line_code.split('_') link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(@project, note.noteable, anchor: note.line_code)
end
link_file = commit.diffs[diff_index.to_i].new_path
link_line = diff_new_line
link_to "#{link_file}:L#{link_line}", project_commit_path(@project, commit, anchor: note.line_code)
end end
end end