X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7793cd27abcc26af103c77d5947c368b54295a79..0b0ff1bcc57efb79a1aa2d962fb3cfc64fe69845:/app/models/changeset.rb diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 549600df6..a4daab801 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -133,7 +133,7 @@ class Changeset < ActiveRecord::Base attr_writer :tags def add_tag_keyval(k, v) - @tags = {} unless @tags + @tags ||= {} # duplicate tags are now forbidden, so we can't allow values # in the hash to be overwritten. @@ -149,7 +149,7 @@ class Changeset < ActiveRecord::Base save! tags = self.tags - ChangesetTag.delete_all(:changeset_id => id) + ChangesetTag.where(:changeset_id => id).delete_all tags.each do |k, v| tag = ChangesetTag.new @@ -241,10 +241,10 @@ class Changeset < ActiveRecord::Base # bounding box, only the tags of the changeset. def update_from(other, user) # ensure that only the user who opened the changeset may modify it. - raise OSM::APIUserChangesetMismatchError.new unless user.id == user_id + raise OSM::APIUserChangesetMismatchError unless user.id == user_id # can't change a closed changeset - raise OSM::APIChangesetAlreadyClosedError.new(self) unless is_open? + raise OSM::APIChangesetAlreadyClosedError, self unless is_open? # copy the other's tags self.tags = other.tags