Remove unused user_blocks translations

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 1f00c46ba6a3fbf8cd279235e873fa5ded52177e..fcff84ededfe0727120794994b5afc5cdaf04ff6 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -31,13 +31,13 @@ class OldWay < ApplicationRecord
   include Redactable
 
   belongs_to :changeset
   include Redactable
 
   belongs_to :changeset

-  belongs_to :redaction
+  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], :inverse_of => :old_way
   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
 
   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], :inverse_of => :old_way
   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [: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 +97,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