Merge remote-tracking branch 'openstreetmap/pull/1449'

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 2614e597124ee8a1aeaa41964c51c6ddc07bff49..9d21959205cbcd12edb261fa7ea81fccd4c0fc01 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"
+
+  validates :trace, :associated => true
+  validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}
 end