From 57dc267f78fbc96e7f30f9a6f16e812de48a93a6 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Mon, 10 Aug 2015 21:40:06 +0300 Subject: [PATCH] Fix new conference creation --- app/controllers/concerns/current_conference_assigning.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/current_conference_assigning.rb b/app/controllers/concerns/current_conference_assigning.rb index d8ccda1..d39fbc3 100644 --- a/app/controllers/concerns/current_conference_assigning.rb +++ b/app/controllers/concerns/current_conference_assigning.rb @@ -12,7 +12,7 @@ module CurrentConferenceAssigning def current_conference if not @current_conference - if @conference + if @conference and not @conference.new_record? @current_conference = @conference elsif params[:conference_id].present? @current_conference = Conference.find(params[:conference_id])