[24164] Fix reference to invalid error result

pull/6827/head
Oliver Günther 8 years ago
parent 72a484b630
commit 830aa53cfe
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 2
      app/controllers/meeting_contents_controller.rb
  2. 1
      app/mailers/meeting_mailer.rb

@ -105,7 +105,7 @@ class MeetingContentsController < ApplicationController
flash[:notice] = l(:notice_successful_notification) flash[:notice] = l(:notice_successful_notification)
else else
flash[:error] = l(:error_notification_with_errors, flash[:error] = l(:error_notification_with_errors,
recipients: recipients_with_errors.map(&:name).join('; ')) recipients: result.errors.map(&:name).join('; '))
end end
end end
redirect_back_or_default controller: '/meetings', action: 'show', id: @meeting redirect_back_or_default controller: '/meetings', action: 'show', id: @meeting

@ -41,7 +41,6 @@ class MeetingMailer < UserMailer
headers['Content-Type'] = 'text/calendar; charset=utf-8; method="PUBLISH"; name="meeting.ics"' headers['Content-Type'] = 'text/calendar; charset=utf-8; method="PUBLISH"; name="meeting.ics"'
headers['Content-Transfer-Encoding'] = '8bit' headers['Content-Transfer-Encoding'] = '8bit'
subject = "[#{@meeting.project.name}] #{I18n.t(:"label_#{content_type}")}: #{@meeting.title}" subject = "[#{@meeting.project.name}] #{I18n.t(:"label_#{content_type}")}: #{@meeting.title}"
now = DateTime.now.strftime("%Y%m%dT%H%M%SZ")
author = Icalendar::Values::CalAddress.new("mailto:#{@meeting.author.mail}", author = Icalendar::Values::CalAddress.new("mailto:#{@meeting.author.mail}",
cn: @meeting.author.name) cn: @meeting.author.name)

Loading…
Cancel
Save