Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes a conflict with treebeard. They stole the name admin_tree_list

Browse source
This commit is contained in:
Corey Oordt 2015-05-06 16:34:38 -05:00
parent c6b7cdd520
commit dd60aebf28
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
categories/editor/templates/admin/editor/tree_editor.html
View file

@ -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 %}

3
categories/editor/templatetags/admin_tree_list.py → categories/editor/templatetags/admin_tree_list_tags.py
View file

@ -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.