Rename create element consistency check

[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 8c89f61de9dfad633a31e65fa8356ad963d75817..a99896b3ce4fde833f8103539273a934503ba7cc 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -16,20 +16,14 @@ module ConsistencyValidations
       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
 
   # This is similar to above, just some validations don't apply
-  def check_create_consistency(new, user)
-    if new.changeset.nil?
-      raise OSM::APIChangesetMissingError
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError
-    elsif !new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, new.changeset
-    end
+  def check_create_element_consistency(new, user)
+    check_changeset_consistency(new.changeset, user)
   end
 
   ##
@@ -42,7 +36,7 @@ module ConsistencyValidations
       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