aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2018-12-03 15:52:08 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2018-12-03 15:52:08 -0800
commit9d798ca9c038059df479233ddc4d35711826bd93 (patch)
tree00b043926bbcd362e772f526fac8206a2bb1c785 /app
parent09da258fab967ac722bca6d63947ec0bfd8ea540 (diff)
downloadrails-9d798ca9c038059df479233ddc4d35711826bd93.tar.gz
rails-9d798ca9c038059df479233ddc4d35711826bd93.tar.bz2
rails-9d798ca9c038059df479233ddc4d35711826bd93.zip
Allow CC, BCC, and In-Reply-To mail attributes to be set on new delivery
Diffstat (limited to 'app')
-rw-r--r--app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb2
-rw-r--r--app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb15
2 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
index 70537da9c4..9804f6ec5b 100644
--- a/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+++ b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
@@ -17,7 +17,7 @@ class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conducto
private
def new_mail
- Mail.new params.require(:mail).permit(:from, :to, :cc, :bcc, :subject, :body).to_h
+ Mail.new params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h
end
def create_inbound_email(mail)
diff --git a/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb b/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
index be989ff0bc..7f1ec74496 100644
--- a/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
+++ b/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
@@ -14,6 +14,21 @@
</div>
<div>
+ <%= form.label :cc, "CC" %><br>
+ <%= form.text_field :cc %>
+ </div>
+
+ <div>
+ <%= form.label :bcc, "BCC" %><br>
+ <%= form.text_field :bcc %>
+ </div>
+
+ <div>
+ <%= form.label :in_reply_to, "In-Reply-To" %><br>
+ <%= form.text_field :in_reply_to %>
+ </div>
+
+ <div>
<%= form.label :subject, "Subject" %><br>
<%= form.text_field :subject %>
</div>