Merge 30de487872 into 7944494f74
This commit is contained in:
commit
4b7dbfbde6
7 changed files with 174 additions and 140 deletions
|
|
@ -6,6 +6,10 @@ class ConferencesController < ApplicationController
|
|||
def index
|
||||
@current = Conference.where('end_date >= ?', Date.current).reorder(start_date: :asc)
|
||||
@antiquated = @conferences - @current
|
||||
|
||||
redirect_to @current.first if @current.count == 1 &&
|
||||
@current.first.splashpage &&
|
||||
@current.first.splashpage.public
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue