adds email sending preferences [#23]
This commit is contained in:
@@ -17,7 +17,7 @@ class AccountController < ApplicationController
|
||||
end
|
||||
|
||||
def account_params
|
||||
params.require(:account).permit(:first_name, :last_name, :nickname, :use_nickname)
|
||||
params.require(:account).permit(:first_name, :last_name, :nickname, :use_nickname, :email_on_debate_comment, :email_on_comment_reply)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -8,8 +8,8 @@ class CommentsController < ApplicationController
|
||||
@comment.save!
|
||||
@comment.move_to_child_of(@parent) if reply?
|
||||
|
||||
Mailer.comment(@comment).deliver_now
|
||||
Mailer.reply(@comment).deliver_now
|
||||
Mailer.comment(@comment).deliver_now if email_on_debate_comment?
|
||||
Mailer.reply(@comment).deliver_now if email_on_comment_reply?
|
||||
|
||||
respond_with @comment
|
||||
end
|
||||
@@ -36,4 +36,12 @@ class CommentsController < ApplicationController
|
||||
def reply?
|
||||
@parent.class == Comment
|
||||
end
|
||||
|
||||
def email_on_debate_comment?
|
||||
@comment.debate.author.email_on_debate_comment?
|
||||
end
|
||||
|
||||
def email_on_comment_reply?
|
||||
reply? && @parent.author.email_on_comment_reply?
|
||||
end
|
||||
end
|
||||
@@ -15,6 +15,16 @@
|
||||
<%= f.label :nickname, t("account.show.nickname_label") %>
|
||||
<%= f.text_field :nickname %>
|
||||
|
||||
<div>
|
||||
<%= f.check_box :email_on_debate_comment %>
|
||||
<%= f.label :email_on_debate_comment, t("account.show.email_on_debate_comment_label") %>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<%= f.check_box :email_on_comment_reply %>
|
||||
<%= f.label :email_on_comment_reply, t("account.show.email_on_comment_reply_label") %>
|
||||
</div>
|
||||
|
||||
<%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
|
||||
<% end %>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user