X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0feca800d91ac1d23eb63ca17a45d8fd4d41920..5ac731a3fc426e83da404788d42927438fe7017d:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index 67222191d..27357e58a 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -1,10 +1,7 @@ class Note < ActiveRecord::Base include GeoRecord - has_many :comments, :class_name => "NoteComment", - :foreign_key => :note_id, - :order => :created_at, - :conditions => { :visible => true } + has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id validates_presence_of :id, :on => :update validates_uniqueness_of :id @@ -14,6 +11,9 @@ class Note < ActiveRecord::Base validates_inclusion_of :status, :in => ["open", "closed", "hidden"] validate :validate_position + scope :visible, -> { where("status != 'hidden'") } + scope :invisible, -> { where("status = 'hidden'") } + after_initialize :set_defaults # Sanity check the latitude and longitude and add an error if it's broken