X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dcfe326f6515cc7aeb9c02b7536e69863c60cd01..6ef6ddc14d2befd784aa57eb595a1f019945edd7:/app/controllers/api/changeset_comments_controller.rb diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index 21c854139..86ac61277 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -7,6 +7,7 @@ module Api before_action :require_public_data, :only => [:create] before_action :check_api_writable before_action :check_api_readable, :except => [:create] + before_action :set_request_formats around_action :api_call_handle_error around_action :api_call_timeout @@ -23,7 +24,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, @@ -32,7 +33,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 @@ -41,6 +42,11 @@ module Api # Return a copy of the updated changeset @changeset = changeset render "api/changesets/changeset" + + respond_to do |format| + format.xml + format.json + end end ## @@ -61,6 +67,11 @@ module Api # Return a copy of the updated changeset @changeset = comment.changeset render "api/changesets/changeset" + + respond_to do |format| + format.xml + format.json + end end ## @@ -81,6 +92,11 @@ module Api # Return a copy of the updated changeset @changeset = comment.changeset render "api/changesets/changeset" + + respond_to do |format| + format.xml + format.json + end end end end