X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..10065abea62eee73eb572be6fd6bcbb4a6f9a6d9:/app/controllers/api/changeset_comments_controller.rb?ds=sidebyside diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index 6093f529e..a3a13b926 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -1,8 +1,6 @@ module Api - class ChangesetCommentsController < ApplicationController - skip_before_action :verify_authenticity_token + class ChangesetCommentsController < ApiController before_action :authorize - before_action :api_deny_access_handler authorize_resource @@ -34,14 +32,15 @@ module Api # Notify current subscribers of the new comment changeset.subscribers.visible.each do |user| - Notifier.changeset_comment_notification(comment, user).deliver_later if current_user != user + UserMailer.changeset_comment_notification(comment, user).deliver_later if current_user != user end # Add the commenter to the subscribers if necessary changeset.subscribers << current_user unless changeset.subscribers.exists?(current_user.id) # Return a copy of the updated changeset - render :xml => changeset.to_xml.to_s + @changeset = changeset + render "api/changesets/changeset" end ## @@ -60,7 +59,8 @@ module Api comment.update(:visible => false) # Return a copy of the updated changeset - render :xml => comment.changeset.to_xml.to_s + @changeset = comment.changeset + render "api/changesets/changeset" end ## @@ -79,7 +79,8 @@ module Api comment.update(:visible => true) # Return a copy of the updated changeset - render :xml => comment.changeset.to_xml.to_s + @changeset = comment.changeset + render "api/changesets/changeset" end end end