From 9f5d7f2bb2c887c315b97180a20727f40dc5b4de Mon Sep 17 00:00:00 2001 From: Andrew Radev Date: Wed, 5 Aug 2015 14:58:24 +0300 Subject: [PATCH] Post-rebase fix --- app/controllers/concerns/current_conference_assigning.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/current_conference_assigning.rb b/app/controllers/concerns/current_conference_assigning.rb index c2a6f2a..d8ccda1 100644 --- a/app/controllers/concerns/current_conference_assigning.rb +++ b/app/controllers/concerns/current_conference_assigning.rb @@ -11,8 +11,12 @@ module CurrentConferenceAssigning end def current_conference - if not @current_conference and params[:conference_id].present? - @current_conference = Conference.find(params[:conference_id]) + if not @current_conference + if @conference + @current_conference = @conference + elsif params[:conference_id].present? + @current_conference = Conference.find(params[:conference_id]) + end end @current_conference