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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 58d1d782f3a35e198f2a25b488fca215e28ff5a3..70296cd54f15115c95a4dcac43d01f234539f554 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,10 +1,26 @@
-class Tracetag < ActiveRecord::Base
-  self.table_name = "gpx_file_tags"
+# == Schema Information
+#
+# Table name: gpx_file_tags
+#
+#  gpx_id :bigint(8)        default(0), not null
+#  tag    :string           not null
+#  id     :bigint(8)        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)
+#
 
-  validates_format_of :tag, :with => /\A[^\/;.,?]*\z/
-  validates_length_of :tag, :within => 1..255
+class Tracetag < ApplicationRecord
+  self.table_name = "gpx_file_tags"
 
-  attr_accessible :tag
+  belongs_to :trace, :foreign_key => "gpx_id", :inverse_of => :tags
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates :trace, :associated => true
+  validates :tag, :length => 1..255, :characters => { :url_safe => true }
 end