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

[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 00c6ce9934b7b37c6a95f74e32a68d4678714668..101fd43103955a024eb57c676ff69a3f356bffc8 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -3,7 +3,7 @@ module ConsistencyValidations
 
   # Generic checks that are run for the updates and deletes of
   # node, ways and relations. This code is here to avoid duplication,
 
   # 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 extention of the checks without having to modify the
+  # 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 :-(
   # This will throw an exception if there is an inconsistency
   # code in 6 places for all the updates and deletes. Some of these tests are
   # needed for creates, but are currently not run :-(
   # This will throw an exception if there is an inconsistency


@@ -16,7 +16,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError

-    elsif !new.changeset.is_open?
+    elsif !new.changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end


@@ -27,7 +27,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError

-    elsif !new.changeset.is_open?
+    elsif !new.changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end


@@ -42,7 +42,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError

-    elsif !changeset.is_open?
+    elsif !changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end