diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-24 18:10:10 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-24 18:10:10 +0300 |
| commit | 0bf339f0ed2f91a805e99fc7483572ad7d22093a (patch) | |
| tree | f536be0bb67775cabcc99b7540bcfd7a108bebcf /app/models | |
| parent | 6e698b254ecddf23a866d9e98a885912102ccbce (diff) | |
Address review
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/discussion_on_diff.rb | 8 | ||||
| -rw-r--r-- | app/models/note.rb | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb index a7bdf5587b2..eee1a36ac6b 100644 --- a/app/models/concerns/discussion_on_diff.rb +++ b/app/models/concerns/discussion_on_diff.rb @@ -47,4 +47,12 @@ module DiscussionOnDiff prev_lines end + + def line_code_in_diffs(diff_refs) + if active?(diff_refs) + line_code + elsif diff_refs && created_at_diff?(diff_refs) + original_line_code + end + end end diff --git a/app/models/note.rb b/app/models/note.rb index fc8baa66b2f..60257aac93b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -124,12 +124,7 @@ class Note < ActiveRecord::Base groups = {} diff_notes.fresh.discussions.each do |discussion| - line_code = - if discussion.active?(diff_refs) - discussion.line_code - elsif diff_refs && discussion.created_at_diff?(diff_refs) - discussion.original_line_code - end + line_code = discussion.line_code_in_diffs(diff_refs) if line_code discussions = groups[line_code] ||= [] |