fix problematic merge

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

diff --git a/app/models/old_segment.rb b/app/models/old_segment.rb
index 7eac278fe2d78176aac3a50d47d4b6189d22cac3..c243c522db628bfd24628feaab9d000b18843ef1 100644 (file)
--- a/app/models/old_segment.rb
+++ b/app/models/old_segment.rb
@@ -1,6 +1,10 @@
 class OldSegment < ActiveRecord::Base
   set_table_name 'segments'
 
 class OldSegment < ActiveRecord::Base
   set_table_name 'segments'
 

+  validates_presence_of :user_id, :timestamp
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :node_a, :node_b
+

   belongs_to :user
 
   def self.from_segment(segment)
   belongs_to :user
 
   def self.from_segment(segment)