Prevent unauthenticated users commenting on notes via the API

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 1324c8139bc933bd05589fadc91ba883c8a3270a..3ec5cd4152939a24bf1816045dfe66bc23b4a262 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -29,13 +29,12 @@ class OldNode < ApplicationRecord
   include ConsistencyValidations
 
   self.table_name = "nodes"
   include ConsistencyValidations
 
   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.
   include Redactable
 
 
   # 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
 

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

   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,


@@ -46,10 +45,10 @@ class OldNode < ApplicationRecord
   validate :validate_position
 
   belongs_to :changeset
   validate :validate_position
 
   belongs_to :changeset

-  belongs_to :redaction
+  belongs_to :redaction, :optional => true

   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
 
   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?


@@ -103,7 +102,7 @@ class OldNode < 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_node.version == version
   end
 end
     current_node.version == version
   end
 end