From afff7e1c660b6362e7b591b81002d9ff001d78e4 Mon Sep 17 00:00:00 2001
From: Marie-Elise <membrq@gmail.com>
Date: Mon, 15 Jan 2018 22:23:38 -0600
Subject: [PATCH] Refactored condition to check if splashpage is present.

---
 app/controllers/conferences_controller.rb | 63 ++++++++++++-----------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index aaa0c278..cb554f0c 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -20,41 +20,42 @@ class ConferencesController < ApplicationController
     authorize! :show, @conference # TODO: reduce the 10 queries performed here
 
     splashpage = @conference.splashpage
-    if !splashpage.present?
-      redirect_to admin_conference_splashpage_path(@conference.short_title)
-    else
-      if splashpage.include_cfp
-        cfps = @conference.program.cfps
-        @call_for_events = cfps.find { |call| call.cfp_type == 'events' }
-        if @call_for_events.try(:open?)
-          @event_types = @conference.event_types.pluck(:title)
-          @track_names = @conference.confirmed_tracks.pluck(:name).sort
-        end
-        @call_for_tracks = cfps.find { |call| call.cfp_type == 'tracks' }
+
+    unless splashpage.present?
+      redirect_to admin_conference_splashpage_path(@conference.short_title) and return 
+    end
+
+    if splashpage.include_cfp
+      cfps = @conference.program.cfps
+      @call_for_events = cfps.find { |call| call.cfp_type == 'events' }
+      if @call_for_events.try(:open?)
+        @event_types = @conference.event_types.pluck(:title)
+        @track_names = @conference.confirmed_tracks.pluck(:name).sort
       end
-      if splashpage.include_program
-        @highlights = @conference.highlighted_events.eager_load(:speakers)
-        if splashpage.include_tracks
-          @tracks = @conference.confirmed_tracks.eager_load(
-            :room
-          ).order('tracks.name')
-        end
-        if splashpage.include_booths
-          @booths = @conference.confirmed_booths.order('title')
-        end
+      @call_for_tracks = cfps.find { |call| call.cfp_type == 'tracks' }
+    end
+    if splashpage.include_program
+      @highlights = @conference.highlighted_events.eager_load(:speakers)
+      if splashpage.include_tracks
+        @tracks = @conference.confirmed_tracks.eager_load(
+          :room
+        ).order('tracks.name')
       end
-      if splashpage.include_registrations || splashpage.include_tickets
-        @tickets = @conference.tickets.order('price_cents')
-      end
-      if splashpage.include_lodgings
-        @lodgings = @conference.lodgings.order('name')
-      end
-      if splashpage.include_sponsors
-        @sponsorship_levels = @conference.sponsorship_levels.eager_load(
-          :sponsors
-        ).order('sponsorship_levels.position ASC', 'sponsors.name')
+      if splashpage.include_booths
+        @booths = @conference.confirmed_booths.order('title')
       end
     end
+    if splashpage.include_registrations || splashpage.include_tickets
+      @tickets = @conference.tickets.order('price_cents')
+    end
+    if splashpage.include_lodgings
+      @lodgings = @conference.lodgings.order('name')
+    end
+    if splashpage.include_sponsors
+      @sponsorship_levels = @conference.sponsorship_levels.eager_load(
+        :sponsors
+      ).order('sponsorship_levels.position ASC', 'sponsors.name')
+    end
   end
 
   private