Add social sharing functionality

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 7af8906b1a9a64b36ab371ab01b62e0411af146b..8577330c52823dd808e5128b7047f7a17dcd9c5a 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -2,7 +2,7 @@
 #
 # Table name: ways
 #
 #
 # Table name: ways
 #

-#  way_id       :bigint(8)        default(0), not null, primary key
+#  way_id       :bigint(8)        not null, primary key

 #  changeset_id :bigint(8)        not null
 #  timestamp    :datetime         not null
 #  version      :bigint(8)        not null, primary key
 #  changeset_id :bigint(8)        not null
 #  timestamp    :datetime         not null
 #  version      :bigint(8)        not null, primary key


@@ -21,23 +21,20 @@
 #
 
 class OldWay < ApplicationRecord
 #
 
 class OldWay < ApplicationRecord

-  include ConsistencyValidations
-

   self.table_name = "ways"
   self.table_name = "ways"

-  self.primary_keys = "way_id", "version"

 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
   belongs_to :changeset
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
   belongs_to :changeset

-  belongs_to :redaction
-  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+  belongs_to :redaction, :optional => true
+  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways

 
 

-  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]
-  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
+  has_many :old_nodes, :class_name => "OldWayNode", :query_constraints => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :query_constraints => [:way_id, :version], :inverse_of => :old_way

 
 

-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 


@@ -97,7 +94,7 @@ class OldWay < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_way.version == version
   end
 end
     current_way.version == version
   end
 end