gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #221 from ChrisBr/bugfix_event

Browse source 
Bugfix events controller
This commit is contained in:
Christian Bruckmayer 2014-06-11 11:54:58 +02:00
commit 17427c88fe
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/events_controller.rb
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?