From 611c8b6e49bd01671c52eb83478c414d91c0d709 Mon Sep 17 00:00:00 2001 From: Chrisbr Date: Tue, 10 Jun 2014 14:39:49 +0200 Subject: [PATCH] Bugfix events controller --- app/controllers/admin/events_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index ee748da7..622a1034 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -163,7 +163,7 @@ class Admin::EventsController < ApplicationController def update_state(id, transition, notice, mail = false) event = Event.find(id) if mail - check_mail_settings + check_mail_settings(event) end if event begin @@ -187,7 +187,7 @@ class Admin::EventsController < ApplicationController end end - def check_mail_settings + def check_mail_settings(event) if !params[:send_mail].blank? && event && event.conference.email_settings.rejected_email_template.nil? && event.conference.email_settings.accepted_email_template.nil?