diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:51:44 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:51:44 +0200 |
| commit | 9945e8c4244d90a0481846454355e02e80369aa2 (patch) | |
| tree | 65edc9427d187ad28c2656bae03fff557842a6ca | |
| parent | e84861d510af63969a7ca09e4248426faf2dd345 (diff) | |
| download | gitlab-ce-9945e8c4244d90a0481846454355e02e80369aa2.tar.gz | |
Move organizing of comments to helper.
| -rw-r--r-- | app/helpers/diff_helper.rb | 14 | ||||
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 22 |
2 files changed, 22 insertions, 14 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index c2ce6ed0fe4..cb50d89cba8 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -103,4 +103,18 @@ module DiffHelper def line_comments @line_comments ||= @line_notes.group_by(&:line_code) end + + def organize_comments(type_left, type_right, line_code_left, line_code_right) + comments_left = comments_right = nil + + unless type_left.nil? && type_right == 'new' + comments_left = line_comments[line_code_left] + end + + unless type_left.nil? && type_right.nil? + comments_right = line_comments[line_code_right] + end + + [comments_left, comments_right] + end end diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 3014e16bc7a..75f3a80f0d7 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -5,7 +5,7 @@ - type_left = line[0] - line_number_left = line[1] - line_content_left = line[2] - - line_code = line[3] + - line_code_left = line[3] - type_right = line[4] - line_number_right = line[5] - line_content_right = line[6] @@ -16,31 +16,25 @@ = render "projects/diffs/match_line_parallel", { line: line_content_left, line_old: line_number_left, line_new: line_number_right } - elsif type_left == 'old' || type_left.nil? - %td.old_line{id: line_code, class: "#{type_left}"} - = link_to raw(line_number_left), "##{line_code}", id: line_code - %td.line_content{class: "parallel noteable_line #{type_left} #{line_code}", "line_code" => line_code }= raw line_content_left + %td.old_line{id: line_code_left, class: "#{type_left}"} + = link_to raw(line_number_left), "##{line_code_left}", id: line_code_left + %td.line_content{class: "parallel noteable_line #{type_left} #{line_code_left}", "line_code" => line_code_left }= raw line_content_left - if type_right == 'new' - new_line_class = 'new' - new_line_code = line_code_right - else - new_line_class = nil - - new_line_code = line_code + - new_line_code = line_code_left %td.new_line{id: new_line_code, class: "#{new_line_class}", data: { linenumber: line_number_right }} = link_to raw(line_number_right), "##{new_line_code}", id: new_line_code %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code}", "line_code" => new_line_code}= raw line_content_right - if @reply_allowed - - if type_left.nil? && type_right == 'new' - - comments1 = nil - - else - - comments1 = line_comments[line_code] - - unless type_left.nil? && type_right.nil? - - comments2 = line_comments[line_code_right] - - - if comments1.present? || comments2.present? - = render "projects/notes/diff_notes_with_reply_parallel", notes1: comments1, notes2: comments2 + - comments_left, comments_right = organize_comments(type_left, type_right, line_code_left, line_code_right) + - if comments_left.present? || comments_right.present? + = render "projects/notes/diff_notes_with_reply_parallel", notes1: comments_left, notes2: comments_right - if diff_file.diff.diff.blank? && diff_file.mode_changed? .file-mode-changed |