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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index f13f7269fbb73625c712bcd7804a254b59661c63..0e9fe126d43dedd182dccffdd661b9ca0f9fd849 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -2,9 +2,9 @@
 #
 # Table name: gpx_file_tags
 #
-#  gpx_id :bigint(8)        default(0), not null
+#  gpx_id :bigint           not null
 #  tag    :string           not null
-#  id     :bigint(8)        not null, primary key
+#  id     :bigint           not null, primary key
 #
 # Indexes
 #
@@ -19,7 +19,7 @@
 class Tracetag < ApplicationRecord
   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 }