diff options
| -rw-r--r-- | app/models/discussion.rb | 18 | ||||
| -rw-r--r-- | app/models/note.rb | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 2c0e6379e6a..0b6b920ed66 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -4,7 +4,7 @@ class Discussion include ResolvableDiscussion - attr_reader :notes, :noteable + attr_reader :notes, :context_noteable delegate :created_at, :project, @@ -16,12 +16,12 @@ class Discussion to: :first_note - def self.build(notes, noteable = nil) - notes.first.discussion_class(noteable).new(notes, noteable) + def self.build(notes, context_noteable = nil) + notes.first.discussion_class(context_noteable).new(notes, context_noteable) end - def self.build_collection(notes, noteable = nil) - notes.group_by { |n| n.discussion_id(noteable) }.values.map { |notes| build(notes, noteable) } + def self.build_collection(notes, context_noteable = nil) + notes.group_by { |n| n.discussion_id(context_noteable) }.values.map { |notes| build(notes, context_noteable) } end # Returns an alphanumeric discussion ID based on `build_discussion_id` @@ -60,14 +60,14 @@ class Discussion DiscussionNote end - def initialize(notes, noteable = nil) + def initialize(notes, context_noteable = nil) @notes = notes - @noteable = noteable + @context_noteable = context_noteable end def ==(other) other.class == self.class && - other.noteable == self.noteable && + other.context_noteable == self.context_noteable && other.id == self.id && other.notes == self.notes end @@ -81,7 +81,7 @@ class Discussion end def id - first_note.discussion_id(noteable) + first_note.discussion_id(context_noteable) end alias_method :to_param, :id diff --git a/app/models/note.rb b/app/models/note.rb index 401e3d7bcbc..1ea7b946061 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -102,8 +102,8 @@ class Note < ActiveRecord::Base ActiveModel::Name.new(self, nil, 'note') end - def discussions(noteable = nil) - Discussion.build_collection(fresh, noteable) + def discussions(context_noteable = nil) + Discussion.build_collection(fresh, context_noteable) end def find_discussion(discussion_id) |