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

Update notes views to support discussions

Browse source
This commit is contained in:
Riyad Preukschas 2012-12-02 20:53:50 +01:00
parent 0b3df2f128
commit 5c2f6d7f05
14 changed files with 270 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/notes_helper.rb
View file

@ -9,13 +9,18 @@ module NotesHelper
# Helps to distinguish e.g. commit notes in mr notes list
def note_for_main_target?(note)
!@mixed_targets || (@main_target_type == note.noteable_type && !note.for_diff_line?)
!@mixed_targets || (@target.class.name == note.noteable_type && !note.for_diff_line?)
end
def link_to_commit_diff_line_note(note)
if note.for_commit_diff_line?
link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(@project, note.noteable, anchor: note.line_code)
end
end
def link_to_merge_request_diff_line_note(note)
if note.for_merge_request_diff_line?
link_to "#{note.diff_file_name}:L#{note.diff_new_line}", diffs_project_merge_request_path(note.project, note.noteable_id, anchor: note.line_code)
end
end
end