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

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

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

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

 #  tag    :string           not null
 #  id     :bigint(8)        not null, primary key
 #
 #  tag    :string           not null
 #  id     :bigint(8)        not null, primary key
 #


@@ -16,10 +16,10 @@
 #  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 :tag, :length => 1..255, :characters => { :url_safe => true }
 
   validates :trace, :associated => true
   validates :tag, :length => 1..255, :characters => { :url_safe => true }