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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 1a4fbd39889195a4653fcc1ed9fec5be3d8e4126..b1dde095c18f7793e524a704f0d7db8550b0f51a 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -2,9 +2,9 @@
 #
 # Table name: gpx_file_tags
 #
 #
 # Table name: gpx_file_tags
 #

-#  gpx_id :integer          default(0), not null
+#  gpx_id :bigint(8)        not null

 #  tag    :string           not null
 #  tag    :string           not null

-#  id     :integer          not null, primary key
+#  id     :bigint(8)        not null, primary key

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -16,11 +16,11 @@
 #  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 
 #  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 

-class Tracetag < ActiveRecord::Base
+class Tracetag < ApplicationRecord

   self.table_name = "gpx_file_tags"
 
   self.table_name = "gpx_file_tags"
 

-  belongs_to :trace, :foreign_key => "gpx_id"
+  belongs_to :trace, :foreign_key => "gpx_id", :inverse_of => :tags

 
   validates :trace, :associated => true
 
   validates :trace, :associated => true

-  validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}
+  validates :tag, :length => 1..255, :characters => { :url_safe => true }

 end
 end