X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792..957d75295b2c379b17e61a2a22ee28fb5f701589:/app/models/note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index bb56c5ce0..31056be49 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,20 +1,18 @@
 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 :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :closed_at, :presence => true, :if => proc { :status == "closed" }
+  validates :status, :inclusion => %w(open closed hidden)
 
-  validates_presence_of :id, :on => :update
-  validates_uniqueness_of :id
-  validates_numericality_of :latitude, :only_integer => true
-  validates_numericality_of :longitude, :only_integer => true
-  validates_presence_of :closed_at if :status == "closed"
-  validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 
-  attr_accessible :lat, :lon
+  scope :visible, -> { where("status != 'hidden'") }
+  scope :invisible, -> { where("status = 'hidden'") }
 
   after_initialize :set_defaults
 
@@ -27,24 +25,14 @@ class Note < ActiveRecord::Base
   def close
     self.status = "closed"
     self.closed_at = Time.now.getutc
-    self.save
+    save
   end
 
-  # Return a flattened version of the comments for a note
-  def flatten_comment(separator_char, upto_timestamp = :nil)
-    resp = ""
-    comment_no = 1
-    self.comments.each do |comment|
-      next if upto_timestamp != :nil and comment.created_at > upto_timestamp
-      resp += (comment_no == 1 ? "" : separator_char)
-      resp += comment.body if comment.body
-      resp += " [ " 
-      resp += comment.author.display_name if comment.author
-      resp += " " + comment.created_at.to_s + " ]"
-      comment_no += 1
-    end
-
-    return resp
+  # Reopen a note
+  def reopen
+    self.status = "open"
+    self.closed_at = nil
+    save
   end
 
   # Check if a note is visible
@@ -54,20 +42,20 @@ class Note < ActiveRecord::Base
 
   # Check if a note is closed
   def closed?
-    not closed_at.nil?
+    !closed_at.nil?
   end
 
   # Return the author object, derived from the first comment
   def author
-    self.comments.first.author
+    comments.first.author
   end
 
   # Return the author IP address, derived from the first comment
   def author_ip
-    self.comments.first.author_ip
+    comments.first.author_ip
   end
 
-private
+  private
 
   # Fill in default values for new notes
   def set_defaults