Merge 1cb51d59ca into e68738c154
This commit is contained in:
commit
664ca790d7
1 changed files with 4 additions and 0 deletions
|
|
@ -6,6 +6,10 @@ class ConferencesController < ApplicationController
|
|||
|
||||
def index
|
||||
@current = Conference.where('end_date >= ?', Date.current).reorder(start_date: :asc)
|
||||
if @current.count == 1
|
||||
# redirect_to "/conferences/#{@current.first.short_title}"
|
||||
redirect_to conference_path(@current.first.short_title)
|
||||
end
|
||||
@antiquated = @conferences - @current
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue