turning the session off for the changeset controller, to come in line with the other...

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 38cd8014f734efe2d27629127609cd7813532288..9dc60de485a18c0d3d7a14ca713cc396bba49392 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -12,8 +12,15 @@ class Changeset < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
   
-  validates_presence_of :user_id, :created_at, :closed_at
-  
+  validates_presence_of :id, :on => :update
+  validates_presence_of :user_id, :created_at, :closed_at, :num_changes
+  validates_uniqueness_of :id
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
+  validates_numericality_of :user_id,  :integer_only => true, :greater_than_or_equal_to => 1
+  validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+  validates_associated :user
+
   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
 
@@ -43,7 +50,7 @@ class Changeset < ActiveRecord::Base
   end
 
   def set_closed_time_now
-    closed_at = DateTime.now
+    self.closed_at = DateTime.now
   end
   
   def self.from_xml(xml, create=false)