gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #926 from sonalkr132/mailer-tests

Browse source 
Mailer fixes and tests
This commit is contained in:
Christian Bruckmayer 2016-04-08 11:43:03 -06:00
commit 86449eea67
6 changed files with 91 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/emails/comment_template.text.erb
View file

@ -4,7 +4,7 @@ User <%= @comment.user.name %> posted a new comment for event <%= @event.title %
"<%= @comment.body %>"
To reply to this comment, please go to <%= h( admin_conference_event_url(@conference.short_title, @event)) %>
To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
Best wishes,
<%= @conference.title %> Team

2
app/views/admin/emails/index.html.haml
View file

@ -35,7 +35,7 @@
= f.input :send_on_rejected, label: "Send an email when the proposal is rejected?", :input_html => {"data-name"=>"email_settings_rejected_subject", "class"=>"send_on_radio"}
= f.input :rejected_subject
= f.input :rejected_body, :input_html => { :rows => 10, :cols => 20 }
%a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for your submission {eventtitle} for the conference {conference}.\nAfter careful consideration we are sorry to inform you that your submissionhas been rejected.\n\n\nBest wishes\n\n{conference} Team",
%a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for your submission {eventtitle} for the conference {conference}.\nAfter careful consideration we are sorry to inform you that your submission has been rejected.\n\n\nBest wishes\n\n{conference} Team",
"data-name"=>"email_settings_rejected_body"} Load Template
%a.btn.btn-link.control_label.template_help_link{"data-name"=>"rejected_help"} Show Help
= render partial: 'help', locals: {id: 'rejected_help', show_event_variables: true}