added missing wording for note "not found" and "timeout"

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 67222191dbe7b84af69d1da81e9b7b4af7aff706..31056be49ca090733b483a09ddeb1ac0f4ecb805 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,19 +1,19 @@
 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
 

+  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
   after_initialize :set_defaults
 
   # Sanity check the latitude and longitude and add an error if it's broken


@@ -25,14 +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
 
   # Reopen a note
   def reopen
     self.status = "open"
     self.closed_at = nil
   end
 
   # Reopen a note
   def reopen
     self.status = "open"
     self.closed_at = nil

-    self.save
+    save

   end
 
   # Check if a note is visible
   end
 
   # Check if a note is visible


@@ -42,20 +42,20 @@ class Note < ActiveRecord::Base
 
   # Check if a note is closed
   def closed?
 
   # 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
   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
   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