Merge api06 branch to trunk.

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index d74a1e75a822a001196132dd993c1834e40778d9..f9833e141446125128a07ab5e03a6c21ba2f9bde 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,6 +1,8 @@
 class Tracetag < ActiveRecord::Base
   set_table_name 'gpx_file_tags'
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates_format_of :tag, :with => /^[^\/;.,?]*$/
+  validates_length_of :tag, :within => 1..255
 
+  belongs_to :trace, :foreign_key => 'gpx_id'
 end