Localisation updates from https://translatewiki.net.

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 077039ac33c2e13c5e0e8f702f1d0d520e2fbd9c..b323f0b4f0eb65bef77b0750008d6a3d95d326cf 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -26,10 +26,8 @@
 
 class OldNode < ApplicationRecord
   include GeoRecord
 
 class OldNode < ApplicationRecord
   include GeoRecord

-  include ConsistencyValidations

 
   self.table_name = "nodes"
 
   self.table_name = "nodes"

-  self.primary_keys = "node_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.
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.


@@ -49,7 +47,7 @@ class OldNode < ApplicationRecord
   belongs_to :redaction, :optional => true
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
 
   belongs_to :redaction, :optional => true
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
 

-  has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node
+  has_many :old_tags, :class_name => "OldNodeTag", :query_constraints => [:node_id, :version], :inverse_of => :old_node

 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?