seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1483 final cleanup

This commit is contained in:
Jonathan Kolyer 2014-04-05 22:16:32 +00:00
parent e5d280e374
commit 887795bead
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/app/admin/email_batch.rb
View File

@ -48,8 +48,8 @@ ActiveAdmin.register JamRuby::EmailBatch, :as => 'Batch Emails' do
batch_test_admin_batch_email_path(bb.id),
:confirm => "Run test batch with #{bb.test_count} emails?") : ''
end
column 'Send Live' do |bb|
bb.can_run_batch? ? link_to("Live Batch (#{User.email_opt_in.count})",
column 'Deliver Live' do |bb|
bb.can_run_batch? ? link_to("Deliver Batch (#{User.email_opt_in.count})",
batch_send_admin_batch_email_path(bb.id),
:confirm => "Run LIVE batch with #{User.email_opt_in.count} emails?") : ''
end

2
ruby/lib/jam_ruby/models/email_batch.rb
View File

@ -20,7 +20,7 @@ Hello #{VAR_FIRST_NAME},
<p>Paragraph 1 ... newline whitespace is significant for plain text conversions</p>
<p>Paragraph 2 ... #{VAR_FIRST_NAME} will be replaced by users first name</p>
<p>Paragraph 2 ... "#{VAR_FIRST_NAME}" will be replaced by users first name</p>
<p>Thanks for using JamKazam!</p>
FOO