Commit 87c44b0e authored by Grzegorz Bizon's avatar Grzegorz Bizon Committed by Robert Speicher

Improve note validation for project mismatch

parent c31a296c
......@@ -29,15 +29,17 @@ class Note < ActiveRecord::Base
# Attachments are deprecated and are handled by Markdown uploader
validates :attachment, file_size: { maximum: :max_attachment_size }
validates :noteable_id, presence: true, if: ->(n) { n.noteable_type.present? && n.noteable_type != 'Commit' }
validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' }
validates :noteable_id, presence: true, unless: :for_commit?
validates :commit_id, presence: true, if: :for_commit?
validates :author, presence: true
with_options unless: :for_commit? do
validate do |note|
unless note.noteable.project == project
unless note.noteable.try(:project) == project
errors.add(:invalid_project, 'Note and noteable project mismatch')
end
end
end
mount_uploader :attachment, AttachmentUploader
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment