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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 8d2f4ffface4d307c0d1013ec212781010c8879d..70296cd54f15115c95a4dcac43d01f234539f554 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -16,10 +16,10 @@
 #  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 
-class Tracetag < ActiveRecord::Base
+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 }