X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/538bfed8a61a576e44d8cc71d7727c0310bcf238..694d45cd31c65e06a342ae3d038af563c5dc7731:/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 9ecd22b45..4cd33a92b 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 @@ -25,7 +23,7 @@ module Api # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open? + raise OSM::APIChangesetNotYetClosedError, changeset if changeset.open? # Add a comment to the changeset comment = changeset.comments.create(:changeset => changeset, @@ -34,7 +32,7 @@ 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 @@ -42,7 +40,7 @@ module Api # Return a copy of the updated changeset @changeset = changeset - render "changesets/changeset" + render "api/changesets/changeset" end ## @@ -62,7 +60,7 @@ module Api # Return a copy of the updated changeset @changeset = comment.changeset - render "changesets/changeset" + render "api/changesets/changeset" end ## @@ -82,7 +80,7 @@ module Api # Return a copy of the updated changeset @changeset = comment.changeset - render "changesets/changeset" + render "api/changesets/changeset" end end end