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

Implements "Add template" button for email settings

Browse source 
fix #16
Subjects now required
This commit is contained in:
Chrisbr 2014-07-18 13:46:39 +02:00
parent 4d25abccc3
commit 6dab37a2b7
3 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/admin/events_controller.rb
View file

@ -127,7 +127,9 @@ module Admin
end
def accept
update_state(params[:id], :accept, 'Event accepted!', true)
event = Event.find(params[:id])
subject = event.conference.email_settings.accepted_subject.blank?
update_state(params[:id], :accept, 'Event accepted!', true, subject)
end
def confirm
@ -139,7 +141,9 @@ module Admin
end
def reject
update_state(params[:id], :reject, 'Event rejected!', true)
event = Event.find(params[:id])
subject = event.conference.email_settings.rejected_subject.blank?
update_state(params[:id], :reject, 'Event rejected!', true, subject)
end
def restart
@ -167,13 +171,11 @@ module Admin
private
def update_state(id, transition, notice, mail = false)
def update_state(id, transition, notice, mail = false, subject = nil)
event = Event.find(id)
if mail && params[:send_mail].blank? && event &&
(event.conference.email_settings.rejected_email_template.nil? ||
event.conference.email_settings.accepted_email_template.nil?)
if mail && params[:send_mail].blank? && event && subject
return redirect_to(admin_conference_events_path(conference_id: @conference.short_title),
notice: 'Update Email Template before Sending Mails') && return
notice: 'Please add a Subject before sending Mails!') && return
end
if event
begin