From 02691f8bf91af50fb2d1b7620529f86406096c3f Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 13 May 2014 15:46:35 +0200 Subject: [PATCH] Fix call for papers validation --- .../admin/callforpapers_controller.rb | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/app/controllers/admin/callforpapers_controller.rb b/app/controllers/admin/callforpapers_controller.rb index 83624d08..bc7b2fd2 100644 --- a/app/controllers/admin/callforpapers_controller.rb +++ b/app/controllers/admin/callforpapers_controller.rb @@ -10,23 +10,29 @@ class Admin::CallforpapersController < ApplicationController def update @cfp = @conference.call_for_papers - @cfp.update_attributes(params[:call_for_papers]) - redirect_to(admin_conference_callforpapers_path( - id: @conference.short_title), - notice: 'Call for Papers was successfully updated.') - end - - def create - @cfp = CallForPapers.new(params[:call_for_papers]) - @conference.call_for_papers = @cfp - if @cfp.save + if @cfp.update_attributes(params[:call_for_papers]) redirect_to(admin_conference_callforpapers_path( id: @conference.short_title), notice: 'Call for Papers was successfully updated.') else redirect_to(admin_conference_callforpapers_path( id: @conference.short_title), - error: 'Call for Papers failed.') + alert: "Updating call for papers failed. #{@cfp.errors.to_a.join(". ")}.") + end + end + + def create + @cfp = CallForPapers.new(params[:call_for_papers]) + if @cfp.valid? + @cfp.save + @conference.call_for_papers = @cfp + redirect_to(admin_conference_callforpapers_path( + id: @conference.short_title), + notice: 'Call for Papers was successfully created.') + else + redirect_to(admin_conference_callforpapers_path( + id: @conference.short_title), + alert: "Creating the call for papers failed. #{@cfp.errors.to_a.join(". ")}.") end end end