Merge branch 'master' into notes

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

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