Add explicit primary key declaration for changeset subscriptions

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index 801e1f3cbee16a2a9c74014321cdd6490ae41ac7..d2c36071da0dfe5b3e8a545446ebe9c0396f6ad6 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,20 +1,18 @@
 class Note < ActiveRecord::Base
   include GeoRecord
 
 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
 
   validate :validate_position
 

-  attr_accessible :lat, :lon
+  scope :visible, -> { where("status != 'hidden'") }
+  scope :invisible, -> { where("status = 'hidden'") }

 
   after_initialize :set_defaults
 
 
   after_initialize :set_defaults
 


@@ -27,24 +25,14 @@ class Note < ActiveRecord::Base
   def close
     self.status = "closed"
     self.closed_at = Time.now.getutc
   def close
     self.status = "closed"
     self.closed_at = Time.now.getutc

-    self.save
+    save

   end
 
   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
   end
 
   # Check if a note is visible


@@ -52,20 +40,25 @@ class Note < ActiveRecord::Base
     status != "hidden"
   end
 
     status != "hidden"
   end
 

+  # Check if a note is closed
+  def closed?
+    !closed_at.nil?
+  end
+

   # Return the author object, derived from the first comment
   def author
   # 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
   end
 
   # Return the author IP address, derived from the first comment
   def author_ip

-    self.comments.first.author_ip
+    comments.first.author_ip

   end
 
   end
 

-private
+  private

 
   # Fill in default values for new notes
   def set_defaults
 
   # Fill in default values for new notes
   def set_defaults

-    self.status = "open" unless self.attribute_present?(:status)
+    self.status = "open" unless attribute_present?(:status)

   end
 end
   end
 end