gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Error messages

Browse source 
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
This commit is contained in:
Ana 2016-08-08 18:29:31 +02:00
parent c687c1072e
commit e8261d41bc
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/admin/programs_controller.rb
View file

@ -13,20 +13,22 @@ module Admin
@program.assign_attributes(program_params)
send_mail_on_schedule_public = @program.notify_on_schedule_public?
respond_to do |format|
if @program.update_attributes(program_params)
ConferenceScheduleUpdateMailJob.perform_later(@conference) if send_mail_on_schedule_public
if @program.update_attributes(program_params)
ConferenceScheduleUpdateMailJob.perform_later(@conference) if send_mail_on_schedule_public
respond_to do |format|
format.html do
redirect_to admin_conference_program_path(@conference.short_title),
notice: 'The program was successfully updated.'
end
format.js { render json: { 'status' => 'ok' } }
else
end
else
respond_to do |format|
format.html do
flash[:error] = "Updating program failed. #{@program.errors.to_a.join('. ')}."
render :new
end
format.js { render json: { 'status' => "The selected schedule couldn't been updated" } }
format.js { render json: { 'status' => "The selected schedule couldn't been updated #{@program.errors.to_a.join('. ')}" } }
end
end
end