Merge remote-tracking branch 'upstream/pull/1948'

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 1b8ba2309de79cdeba32938b4ed2b283841f903f..1a4fbd39889195a4653fcc1ed9fec5be3d8e4126 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,10 +1,26 @@
+# == Schema Information
+#
+# Table name: gpx_file_tags
+#
+#  gpx_id :integer          default(0), not null
+#  tag    :string           not null
+#  id     :integer          not null, primary key
+#
+# Indexes
+#
+#  gpx_file_tags_gpxid_idx  (gpx_id)
+#  gpx_file_tags_tag_idx    (tag)
+#
+# Foreign Keys
+#
+#  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
+#
+
 class Tracetag < ActiveRecord::Base
   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"
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates :trace, :associated => true
+  validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}
 end