app/controllers/export_email_controller.rb in umlaut-4.0.3 vs app/controllers/export_email_controller.rb in umlaut-4.1.0.pre.alpha.1
- old
+ new
@@ -9,11 +9,11 @@
def send_email
@email = params[:email]
@fulltexts = @user_request.get_service_type('fulltext', { :refresh=>true })
@holdings = @user_request.get_service_type('holding', { :refresh=>true })
if valid_email?
- Emailer.citation(@email, @user_request, @fulltexts, @holdings).deliver
+ action_mailer_deliver Emailer.citation(@email, @user_request, @fulltexts, @holdings)
else
flash[:alert] = email_validation_error
render :email and return
end
end
@@ -27,10 +27,10 @@
@number.gsub!(/[^\d]/, '') if @number
@provider = params[:provider]
@email = "#{@number}@#{@provider}" unless @number.nil? or @provider.nil?
@holding = params[:holding]
if valid_txt_number? && valid_txt_holding?
- Emailer.short_citation(@email, @user_request, holding_location(@holding), call_number(@holding)).deliver
+ action_mailer_deliver Emailer.short_citation(@email, @user_request, holding_location(@holding), call_number(@holding))
else
flash[:alert] = txt_validation_error
render :txt and return
end
end
\ No newline at end of file