maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle liquid tag errors in comments form (#5485) [deploy]

Browse source 
* Handle liquid tag errors in comments form
* Do not hide Pundit::NotAuthorizedError errors
This commit is contained in:
rhymes 2020-01-14 20:10:05 +01:00 • committed by Molly Struve
parent c0a7c17054
commit ff7532b3db
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/initializers/initializeCommentsPage.js.erb
View file

@ -144,7 +144,7 @@ function initializeCommentsPage() {
};
}
if (document.getElementById('new_comment')) {
document.getElementById('new_comment').onsubmit = handleCommentSubmit;
document.getElementById('new_comment').addEventListener('submit', handleCommentSubmit);
}
}
listenForDetailsToggle();
@ -255,6 +255,12 @@ function handleCommentSubmit(event) {
initializeCommentDate();
initializeCommentDropdown();
})
} else {
response.json().then(function parseError(errorReponse) {
form.classList.remove('submitting');
window.alert(errorReponse.error); // eslint-disable-line no-alert
return false;
});
}
return false;
});

13
app/controllers/comments_controller.rb
View file

@ -59,10 +59,13 @@ class CommentsController < ApplicationController
authorize @comment
if @comment.save
current_user.update(checked_code_of_conduct: true) if params[:checked_code_of_conduct].present? && !current_user.checked_code_of_conduct
checked_code_of_conduct = params[:checked_code_of_conduct].present? && !current_user.checked_code_of_conduct
current_user.update(checked_code_of_conduct: true) if checked_code_of_conduct
Mention.create_all(@comment)
NotificationSubscription.create(user: current_user, notifiable_id: @comment.id, notifiable_type: "Comment", config: "all_comments")
NotificationSubscription.create(
user: current_user, notifiable_id: @comment.id, notifiable_type: "Comment", config: "all_comments",
)
Notification.send_new_comment_notifications_without_delay(@comment)
if @comment.invalid?
@ -99,6 +102,12 @@ class CommentsController < ApplicationController
else
render json: { status: "errors" }
end
rescue Pundit::NotAuthorizedError
raise
rescue StandardError => e
Rails.logger.error(e)
message = "There was a error in your markdown: #{e}"
render json: { error: message }, status: :unprocessable_entity
end
# PATCH/PUT /comments/1