From 9d423633597c5c2401170cde33f51a24de9c7af6 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Fri, 7 Feb 2014 16:51:00 +0100
Subject: Fix side body part on pages where there is no side body.

---
 app/helpers/sidebar_helper.rb            | 5 +++++
 app/views/common/_right_sidebar.html.erb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb
index f9d4834..e8e076a 100644
--- a/app/helpers/sidebar_helper.rb
+++ b/app/helpers/sidebar_helper.rb
@@ -12,4 +12,9 @@ module SidebarHelper
       render m.to_partial_path, :sidebar_module => m
     }.join().html_safe
   end
+
+  def page_has_side_body?(page)
+    part = page.part_with_title("Side Body")
+    return part.present? && !part.body.empty?
+  end
 end
diff --git a/app/views/common/_right_sidebar.html.erb b/app/views/common/_right_sidebar.html.erb
index 3b17356..15dfb83 100644
--- a/app/views/common/_right_sidebar.html.erb
+++ b/app/views/common/_right_sidebar.html.erb
@@ -1,5 +1,5 @@
 <div id="right_sidebar">
-  <% unless @page.part_with_title("Side Body").body.empty? %>
+  <% if page_has_side_body?(@page) %>
     <div class="sidebar_module">
       <h1>Sjefen melder</h1>
       <div class="inner"><%= raw @page.content_for(:side_body) %></div>
-- 
cgit v1.2.3