From 8e01b1156995cdf6c7798cd0dd434c5905fd6664 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 8 May 2020 12:00:03 +0200
Subject: [PATCH] Move conditional into shared banner partial

To avoid always writing if has_banners? every time the partial is used it has been moved within this partial.
---
 app/views/budgets/index.html.erb    |  4 +---
 app/views/debates/index.html.erb    |  4 +---
 app/views/pages/help/index.html.erb |  4 +---
 app/views/proposals/index.html.erb  |  4 +---
 app/views/shared/_banner.html.erb   | 10 ++++++----
 app/views/welcome/index.html.erb    |  4 +---
 6 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb
index e8d58d08a..b24d67e16 100644
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -1,6 +1,4 @@
-<% if has_banners? %>
-  <%= render "shared/banner" %>
-<% end %>
+<%= render "shared/banner" %>
 
 <% provide :title do %><%= t("budgets.index.title") %><% end %>
 
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 31f08a8a0..ce86822b2 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -40,9 +40,7 @@
   <div class="row">
     <div id="debates" class="debates-list small-12 medium-9 column">
 
-      <% if has_banners? %>
-        <%= render "shared/banner" %>
-      <% end %>
+      <%= render "shared/banner" %>
 
       <% unless @search_terms || !has_featured? %>
         <%= render "featured_debates" %>
diff --git a/app/views/pages/help/index.html.erb b/app/views/pages/help/index.html.erb
index c31b615a9..505ff2196 100644
--- a/app/views/pages/help/index.html.erb
+++ b/app/views/pages/help/index.html.erb
@@ -3,9 +3,7 @@
   <%= render "shared/canonical", href: help_url %>
 <% end %>
 
-<% if has_banners? %>
-  <%= render "shared/banner" %>
-<% end %>
+<%= render "shared/banner" %>
 
 <div class="jumbo light">
   <div class="row">
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index ddfb6ff08..fe79eea51 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -49,9 +49,7 @@
   <div class="row">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
 
-      <% if has_banners? %>
-        <%= render "shared/banner" %>
-      <% end %>
+      <%= render "shared/banner" %>
 
       <% if show_featured_proposals? %>
         <div id="featured-proposals" class="row featured-proposals">
diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb
index 9da5bfa6d..d426ee3dd 100644
--- a/app/views/shared/_banner.html.erb
+++ b/app/views/shared/_banner.html.erb
@@ -1,4 +1,6 @@
-<% banner ||= @banners.sample %>
-<div class="banner" style="background-color:<%= banner.background_color %>;">
-  <%= sanitize banner_target_link(banner), attributes: %w[href style] %>
-</div>
+<% if has_banners? || controller.class == Admin::BannersController %>
+  <% banner ||= @banners.sample %>
+  <div class="banner" style="background-color:<%= banner.background_color %>;">
+    <%= sanitize banner_target_link(banner), attributes: %w[href style] %>
+  </div>
+<% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 35b557edc..fafbcafbb 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -4,9 +4,7 @@
   <%= render "shared/canonical", href: root_url %>
 <% end %>
 
-<% if has_banners? %>
-  <%= render "shared/banner" %>
-<% end %>
+<%= render "shared/banner" %>
 
 <% provide :social_media_meta_tags do %>
   <%= render "shared/social_media_meta_tags",