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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index f1d5967d53dd5c38b75d591b792cf6a330cd69ad..9d21959205cbcd12edb261fa7ea81fccd4c0fc01 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,7 +1,8 @@
 class Tracetag < ActiveRecord::Base
-  set_table_name 'gpx_file_tags'
+  self.table_name = "gpx_file_tags"
 
-  validates_format_of :tag, :with => /^[^\/;.,?]*$/
+  belongs_to :trace, :foreign_key => "gpx_id"
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates :trace, :associated => true
+  validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}
 end