Skip to content

Commit

Permalink
Merge pull request #186 from sparc-request/jw_attachments_xlsx
Browse files Browse the repository at this point in the history
changed file type from xls to xlsx.  Need ideas for testing.
  • Loading branch information
jwiel86 committed Oct 30, 2015
2 parents f263c16 + 4ceff9d commit 80113b3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/mailers/notifier.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def notify_user(project_role, service_request, xls, approval, user_current)
@triggered_by = user_current.id
@ssr_ids = service_request.sub_service_requests.map{ |ssr| ssr.id }.join(", ")

attachments["service_request_#{@service_request.protocol.id}.xls"] = xls
attachments["service_request_#{@service_request.protocol.id}.xlsx"] = xls

# only send these to the correct person in the production env
email = Rails.env == 'production' ? @identity.email : DEFAULT_MAIL_TO
Expand All @@ -82,7 +82,7 @@ def notify_admin(service_request, submission_email_address, xls, user_current)
@triggered_by = user_current.id
@ssr_ids = service_request.sub_service_requests.map{ |ssr| ssr.id }.join(", ")

attachments["service_request_#{@service_request.protocol.id}.xls"] = xls
attachments["service_request_#{@service_request.protocol.id}.xlsx"] = xls

# only send these to the correct person in the production env
email = Rails.env == 'production' ? submission_email_address : DEFAULT_MAIL_TO
Expand Down

0 comments on commit 80113b3

Please sign in to comment.