From d4df2278112aa1396f53bcd9362bb2c0556a60af Mon Sep 17 00:00:00 2001 From: spen Date: Mon, 13 Oct 2014 15:25:30 +0800 Subject: [PATCH] fixed orbit mailer for no file title --- app/mailers/orbit_mailer.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/mailers/orbit_mailer.rb b/app/mailers/orbit_mailer.rb index a382bb2..faa4c1a 100644 --- a/app/mailers/orbit_mailer.rb +++ b/app/mailers/orbit_mailer.rb @@ -29,9 +29,16 @@ class OrbitMailer < ActionMailer::Base unless email.email_files.blank? email.email_files.each_with_index do |email_file, i| - file_type = File.extname(email_file.file.to_s) - # file_content = File.read(email_file.file.url) - attachments["#{email_file.title}#{file_type}"] = email_file.file.read + unless email_file.file.blank? + if !email_file.title.blank? + file_type = File.extname(email_file.file.to_s) + # file_content = File.read(email_file.file.url) + attachments["#{email_file.title}#{file_type}"] = email_file.file.read + else + file_name = File.basename(email_file.file.path) + attachments["#{file_name}"] = email_file.file.read + end + end end end