Fixes a conflict with treebeard. They stole the name admin_tree_list

jazzband · Jun 9, 2015 · dd60aeb · dd60aeb
1 parent c6b7cdd
commit dd60aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/categories/editor/templates/admin/editor/tree_editor.html b/categories/editor/templates/admin/editor/tree_editor.html
@@ -1,5 +1,4 @@
 {% extends "admin/change_list.html" %}
-{% load admin_list i18n admin_tree_list %}
 {% block extrahead %}
     {{block.super}}
     <script type="text/javascript">
@@ -33,6 +32,7 @@
     </script>
 {% endblock %}
 {% block result_list %}
+    {% load admin_list i18n admin_tree_list_tags %}
     {% if action_form and actions_on_top and cl.full_result_count %}{% admin_actions %}{% endif %}
     {% result_tree_list cl %}
     {% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %}

diff --git a/...es/editor/templatetags/admin_tree_list.py → ...itor/templatetags/admin_tree_list_tags.py b/...es/editor/templatetags/admin_tree_list.py → ...itor/templatetags/admin_tree_list_tags.py
@@ -64,7 +64,6 @@ def items_for_tree_result(cl, result, form):
                 if django.VERSION[1] < 4:
                     try:
                         f, attr, checkbox_value = lookup_field('action_checkbox', result, cl.model_admin)
-                        #result_repr = mark_safe("%s%s" % (value, result_repr))
                         if row_class:
                             row_class = "%s%s" % (row_class[:-1], ' disclosure"')
                         else:
@@ -79,7 +78,7 @@ def items_for_tree_result(cl, result, form):
             if django.VERSION[1] < 4:
                 table_tag = 'td'  # {True:'th', False:'td'}[first]
             else:
-                table_tag = {True:'th', False:'td'}[first]
+                table_tag = {True: 'th', False: 'td'}[first]
 
             url = cl.url_for_result(result)
             # Convert the pk to something that can be used in Javascript.