Merge pull request #621 from alphagov/fix-publication-sidebar

Fix sidebar rendering on publications

app/controllers/content_items_controller.rb

@@ -71,11 +71,7 @@ def present(content_item)
   end
 
   def content_item_template
-    if publication_with_sidebar?
-      publication_with_sidebar_template_name
-    else
-      @content_item.schema_name
-    end
+    @content_item.schema_name
   end
 
   def render_template

app/views/shared/_sidebar_navigation.html.erb

@@ -1,11 +1,11 @@
-<% if local_assigns.has_key?(:tasklist) && current_tasklist_ab_test.show_tasklist_sidebar? %>
-  <%= render 'shared/sidebar_tasklist', tasklist: tasklist %>
-<% elsif @navigation.should_present_taxonomy_navigation? -%>
-  <div class="column-third add-title-margin">
-    <%= render partial: 'govuk_component/taxonomy_sidebar', locals: @content_item.taxonomy_sidebar %>
-  </div>
+<% if local_assigns.has_key?(:tasklist_content) && current_tasklist_ab_test.show_tasklist_sidebar? %>
+  <%= render 'shared/sidebar_tasklist', tasklist_content: tasklist_content %>
 <% else %>
-  <div class="column-third add-title-margin">
+  <div class="column-third">
+  <% if @navigation.should_present_taxonomy_navigation? -%>
+    <%= render partial: 'govuk_component/taxonomy_sidebar', locals: @content_item.taxonomy_sidebar %>
+  <% else %>
     <%= render partial: 'components/related-navigation', locals: @content_item.related_navigation %>
+  <% end %>
   </div>
 <% end %>