gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2629 from esparta/conference_index_dry

Browse source 
DRY on controllers/conferences_controller#index
This commit is contained in:
Henne Vogelsang 2021-03-06 19:10:45 +01:00 • committed by GitHub
commit d928be7e18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/conferences_controller.rb
View file

@ -6,8 +6,8 @@ class ConferencesController < ApplicationController
load_and_authorize_resource find_by: :short_title, except: :show load_and_authorize_resource find_by: :short_title, except: :show
def index def index
@current = Conference.where('end_date >= ?', Date.current).reorder(start_date: :asc) @current = Conference.upcoming.reorder(start_date: :asc)
@antiquated = Conference.where('end_date < ?', Date.current) @antiquated = Conference.past
if @antiquated.empty? && @current.empty? && User.empty? if @antiquated.empty? && @current.empty? && User.empty?
render :new_install render :new_install
end end