Fix validation failures for trace tags

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 00f195e69a1323b47448d2114c69b563f4dd4f96..d4298f9df24adfda803382664432693fc0015254 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,8 +1,8 @@
 class Tracetag < ActiveRecord::Base
   self.table_name = "gpx_file_tags"
 
-  validates_format_of :tag, :with => /\A[^\/;.,?]*\z/
-  validates_length_of :tag, :within => 1..255
+  belongs_to :trace, :foreign_key => "gpx_id"
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates :trace, :associated => true
+  validates :tag, :length => 1..255, :format => /\A[^\/;.,?]*\z/
 end