Merge remote-tracking branch 'upstream/pull/4949'

[rails.git] / app / models / concerns / consistency_validations.rb

diff --git a/app/models/concerns/consistency_validations.rb b/app/models/concerns/consistency_validations.rb
index 8b97e2b70592f4c42f1e67fb14379679bf28ad5f..2df85f2ac17962ebb4ff72e006693e50f8ba0188 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -4,10 +4,9 @@ module ConsistencyValidations
   # Generic checks that are run for the updates and deletes of
   # node, ways and relations. This code is here to avoid duplication,
   # and allow the extension of the checks without having to modify the
-  # code in 6 places for all the updates and deletes. Some of these tests are
-  # needed for creates, but are currently not run :-(
+  # code in 6 places for all the updates and deletes.
   # This will throw an exception if there is an inconsistency
-  def check_consistency(old, new, user)
+  def check_update_element_consistency(old, new, user)
     if new.id != old.id || new.id.nil? || old.id.nil?
       raise OSM::APIPreconditionFailedError, "New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}."
     elsif new.version != old.version