From 63515cef5803b2882ec21b6bc557cbc574fdce00 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Wed, 17 Jan 2018 17:03:23 -0800
Subject: [PATCH] Change Conference#show to load sponsors

Caching on sponsorship levels alone is not changing; as a bonus the sponsor
modals are simplified a little.
---
 app/controllers/conferences_controller.rb | 1 +
 app/views/conferences/_sponsors.haml      | 4 ++--
 app/views/conferences/show.html.haml      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 5e907cea..1c9b37b3 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -55,6 +55,7 @@ class ConferencesController < ApplicationController
       @sponsorship_levels = @conference.sponsorship_levels.eager_load(
         :sponsors
       ).order('sponsorship_levels.position ASC', 'sponsors.name')
+      @sponsors = @conference.sponsors
     end
   end
 
diff --git a/app/views/conferences/_sponsors.haml b/app/views/conferences/_sponsors.haml
index 8f4d55c6..5d7bbaa9 100644
--- a/app/views/conferences/_sponsors.haml
+++ b/app/views/conferences/_sponsors.haml
@@ -2,7 +2,7 @@
   %li
     %a.smoothscroll{ href: '#sponsors' } Sponsors
 
-- cache [conference, sponsorship_levels, '#splash#sponsors'] do
+- cache [conference, sponsors, sponsorship_levels, '#splash#sponsors'] do
   %section#sponsors
     .container
       - sponsorship_levels.each do |sponsorship_level|
@@ -31,6 +31,6 @@
             = link_to(sponsorship_mailto(conference)) do
               Contact us!
 
-- sponsorship_levels.collect(&:sponsors).flatten.each do |sponsor|
+- sponsors.each do |sponsor|
   - content_for :modals do
     = render 'modal_description', object: sponsor
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index ea99b419..246ccc35 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -43,7 +43,8 @@
   -# sponsorship
   - if @conference.splashpage.include_sponsors
     = render 'sponsors', conference: @conference,
-      sponsorship_levels: @sponsorship_levels
+      sponsorship_levels: @sponsorship_levels,
+      sponsors: @sponsors
 
   -# footer
   - if @conference.splashpage.include_social_media