From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Mar 2012 00:31:53 +0000 (+0000)
Subject: Make setting of a default status for new notes work
X-Git-Tag: live~5091^2~117
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2e1d9f3348c0daa482397049d009e26bbedc00bd?ds=sidebyside

Make setting of a default status for new notes work
---

diff --git a/app/models/note.rb b/app/models/note.rb
index a2937074c..76c5e5308 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -14,16 +14,13 @@ class Note < ActiveRecord::Base
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 
+  after_initialize :set_defaults
+
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Note is not in the world") unless in_world?
   end
 
-  # Fill in default values for new notes
-  def after_initialize
-    self.status = "open" unless self.attribute_present?(:status)
-  end
-
   # Close a note
   def close
     self.status = "closed"
@@ -72,4 +69,11 @@ class Note < ActiveRecord::Base
   def author_name
     self.comments.first.author_name
   end
+
+private
+
+  # Fill in default values for new notes
+  def set_defaults
+    self.status = "open" unless self.attribute_present?(:status)
+  end
 end