Remove duplicate translation key

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 767289d583ddc3b3a3769b37e4ba2714ad00aebb..b11c225ddb1cfd0a6fb604174d4e39354eab0276 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -27,9 +27,9 @@ class Way < ApplicationRecord
 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

-  has_many :old_ways, -> { order(:version) }
+  has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way

 
 

-  has_many :way_nodes, -> { order(:sequence_id) }
+  has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way

   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags
   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags


@@ -227,7 +227,7 @@ class Way < ApplicationRecord
   private
 
   def save_with_history!
   private
 
   def save_with_history!

-    t = Time.now.getutc
+    t = Time.now.utc

 
     self.version += 1
     self.timestamp = t
 
     self.version += 1
     self.timestamp = t