From 1ddf5b517633d4d75863f244fe8bb7643f7b9597 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 13 Feb 2019 17:25:06 +0000
Subject: [PATCH] Fix misaligned checkboxes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The template list wasn’t getting the right class applied because the
check was referring to an undefined variable (`can_manage_folders`) that
should have been removed when all other references to it were.
---
 app/templates/views/templates/_template_list.html | 2 +-
 tests/app/main/views/test_template_folders.py     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index 3920edc5a..f09ceca63 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -12,7 +12,7 @@
 {% else %}
   <nav id=template-list>
     {% for item in template_list %}
-      <div class="template-list-item {% if can_manage_folders %}template-list-item-with-checkbox{% endif %} {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
+      <div class="template-list-item {% if current_user.has_permissions('manage_templates') %}template-list-item-with-checkbox{% endif %} {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
         {% if current_user.has_permissions('manage_templates') %}
           {{ unlabelled_checkbox(
             id='templates-or-folder-{}'.format(item.id),
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index 0cb5248e6..9e80ea260 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -339,6 +339,10 @@ def test_should_show_templates_folder_page(
         assert links_in_page[index].text.strip() == expected_link
 
     all_page_items = page.select('.template-list-item')
+    all_page_items_styled_with_checkboxes = page.select('.template-list-item-with-checkbox')
+
+    assert len(all_page_items) == len(all_page_items_styled_with_checkboxes)
+
     checkboxes = page.select('input[name=templates_and_folders]')
     unique_checkbox_values = set(item['value'] for item in checkboxes)
     assert len(all_page_items) == len(expected_items)