Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Post-rebase fix

This commit is contained in:
Andrew Radev 2015-08-05 14:58:24 +03:00
parent 9d53e49fb4
commit 9f5d7f2bb2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/concerns/current_conference_assigning.rb
View File

@ -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