Don't set width of richtext preview

[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..2df85f2ac17962ebb4ff72e006693e50f8ba0188 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -4,32 +4,21 @@ 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
   # 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
   # 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
       raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     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
       raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)

-    elsif 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
     end

+
+    check_changeset_consistency(new.changeset, user)

   end
 
   # This is similar to above, just some validations don't apply
   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
 
   ##
   end
 
   ##


@@ -42,7 +31,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