Apply automatic rubocop fixes
This commit is contained in:
@ -86,7 +86,7 @@ class CommentsController < ApplicationController
|
||||
# params.require(:comment).permit(:user_id, :file_id, :row, :column, :text)
|
||||
# fuer production mode, damit böse menschen keine falsche user_id uebergeben:
|
||||
params.require(:comment).permit(:file_id, :row, :column, :text, :request_id).merge(user_id: current_user.id,
|
||||
user_type: current_user.class.name)
|
||||
user_type: current_user.class.name)
|
||||
end
|
||||
|
||||
def send_mail_to_author(comment, request_for_comment)
|
||||
@ -99,10 +99,10 @@ user_type: current_user.class.name)
|
||||
request_for_comment.commenters.each do |commenter|
|
||||
already_sent_mail = false
|
||||
subscriptions = Subscription.where(
|
||||
request_for_comment_id: request_for_comment.id,
|
||||
user_id: commenter.id, user_type: commenter.class.name,
|
||||
deleted: false
|
||||
)
|
||||
request_for_comment_id: request_for_comment.id,
|
||||
user_id: commenter.id, user_type: commenter.class.name,
|
||||
deleted: false
|
||||
)
|
||||
subscriptions.each do |subscription|
|
||||
if (((subscription.subscription_type == 'author') && (current_user == request_for_comment.user)) || (subscription.subscription_type == 'all')) && !((subscription.user == current_user) || already_sent_mail)
|
||||
UserMailer.got_new_comment_for_subscription(comment, subscription, current_user).deliver_now
|
||||
|
Reference in New Issue
Block a user