Bugfix events controller

This commit is contained in:
Chrisbr 2014-06-10 14:39:49 +02:00
parent 069cc0eb4c
commit 611c8b6e49

View file

@ -163,7 +163,7 @@ class Admin::EventsController < ApplicationController
def update_state(id, transition, notice, mail = false) def update_state(id, transition, notice, mail = false)
event = Event.find(id) event = Event.find(id)
if mail if mail
check_mail_settings check_mail_settings(event)
end end
if event if event
begin begin
@ -187,7 +187,7 @@ class Admin::EventsController < ApplicationController
end end
end end
def check_mail_settings def check_mail_settings(event)
if !params[:send_mail].blank? && event && if !params[:send_mail].blank? && event &&
event.conference.email_settings.rejected_email_template.nil? && event.conference.email_settings.rejected_email_template.nil? &&
event.conference.email_settings.accepted_email_template.nil? event.conference.email_settings.accepted_email_template.nil?