* Bugfix for Django 1.10 template handling

* Updated to tri.form 4.7.1

* Moved bulk button inside the table tag

* Dropped support for Django 1.7

Author: boxed

HISTORY.rst

@@ -1,6 +1,18 @@
 Changelog
 ---------
 
+4.3.0 (2017-04-25)
+~~~~~~~~~~~~~~~~~~
+
+* Bugfix for Django 1.10 template handling
+
+* Updated to tri.form 4.7.1
+
+* Moved bulk button inside the table tag
+
+* Dropped support for Django 1.7
+
+
 4.2.0 (2017-04-21)
 ~~~~~~~~~~~~~~~~~~
 

lib/tri/table/__init__.py

@@ -3,8 +3,6 @@
 from __future__ import unicode_literals
 
 import copy
-import json
-import warnings
 from collections import OrderedDict
 from itertools import groupby
 
@@ -13,18 +11,17 @@
 from django.conf import settings
 from django.core.paginator import Paginator, InvalidPage
 from django.http import HttpResponse, Http404, HttpResponseRedirect
-from django.template import RequestContext
 from django.template.defaultfilters import slugify
-from django.template.loader import render_to_string, get_template
+from django.template.loader import render_to_string
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.html import conditional_escape, format_html
 from django.utils.safestring import mark_safe
 from django.db.models import QuerySet
 import six
 from tri.declarative import declarative, creation_ordered, with_meta, setdefaults, evaluate_recursive, evaluate, getattr_path, sort_after, LAST, setdefaults_path, dispatch, EMPTY, flatten, Namespace, setattr_path
-from tri.form import Field, Form, member_from_model, expand_member, create_members_from_model
+from tri.form import Field, Form, member_from_model, expand_member, create_members_from_model, render_template, handle_dispatch, DISPATCH_PATH_SEPARATOR
 from tri.named_struct import NamedStructField, NamedStruct
-from tri.struct import Struct
+from tri.struct import Struct, merged
 from tri.query import Query, Variable, QueryException, Q_OP_BY_OP
 
 from tri.table.db_compat import setup_db_compat
@@ -542,12 +539,8 @@ def __init__(self, table, row, row_index, template, attrs, extra):
 
     def render(self):
         if self.template:
-            context = RequestContext(self.table.request, dict(bound_row=self, row=self.row, table=self.table))
-            if isinstance(self.template, six.string_types):
-                # positional arguments here to get compatibility with both django 1.7 and 1.8+
-                return render_to_string(self.template, context)
-            else:
-                return self.template.render(context)
+            context = dict(bound_row=self, row=self.row, table=self.table)
+            return render_template(self.table.request, self.template, context)
 
         return format_html('<tr{}>{}</tr>', self.render_attrs(), self.render_cells())
 
@@ -607,11 +600,8 @@ def url_title(self):
     def render(self):
         cell__template = self.bound_column.cell.template
         if cell__template:
-            context = RequestContext(self.table.request, dict(table=self.table, bound_column=self.bound_column, bound_row=self.bound_row, row=self.row, value=self.value, bound_cell=self))
-            if isinstance(cell__template, six.string_types):
-                return render_to_string(cell__template, context)
-            else:
-                return cell__template.render(context)
+            context = dict(table=self.table, bound_column=self.bound_column, bound_row=self.bound_row, row=self.row, value=self.value, bound_cell=self)
+            return render_template(self.table.request, cell__template, context)
 
         return format_html('<td{}>{}</td>', self.render_attrs(), self.render_cell_contents())
 
@@ -702,7 +692,6 @@ def __init__(self, data=None, request=None, columns=None, columns_dict=None, mod
         """
 
         if data is None:  # pragma: no cover
-            warnings.warn('deriving model from data queryset is deprecated, use Table.from_model', DeprecationWarning)
             assert model is not None
             data = model.objects.all()
 
@@ -764,18 +753,15 @@ def generate_columns():
         """ :type: tri.declarative.Namespace """
 
     def render_links(self):
-        return self.render_template_config(self.links, self.context)
+        return render_template(self.request, self.links.template, self.context)
 
     def render_header(self):
-        return self.render_template_config(self.header, self.context)
+        return render_template(self.request, self.header.template, self.context)
 
     def render_filter(self):
         if not self.query_form:
             return ''
-        context = self.context
-        with context.push():
-            context['form'] = self.query_form
-            return self.render_template_config(self.filter, context)
+        return render_template(self.request, self.filter.template, merged(self.context, form=self.query_form))
 
     @staticmethod
     def render_template_config(template_config, context):
@@ -942,7 +928,7 @@ def generate_variables():
             self.query = Query(
                 request=request,
                 variables=variables,
-                endpoint_dispatch_prefix='__'.join(part for part in [self.endpoint_dispatch_prefix, 'query'] if part is not None),
+                endpoint_dispatch_prefix=DISPATCH_PATH_SEPARATOR.join(part for part in [self.endpoint_dispatch_prefix, 'query'] if part is not None),
                 **flatten(self.query_args)
             )
             self.query_form = self.query.form() if self.query.variables else None
@@ -978,7 +964,7 @@ def generate_bulk_fields():
             self.bulk_form = Form(
                 data=request.POST,
                 fields=bulk_fields,
-                endpoint_dispatch_prefix='__'.join(part for part in [self.endpoint_dispatch_prefix, 'bulk'] if part is not None),
+                endpoint_dispatch_prefix=DISPATCH_PATH_SEPARATOR.join(part for part in [self.endpoint_dispatch_prefix, 'bulk'] if part is not None),
                 **flatten(self.bulk)
             ) if bulk_fields else None
 
@@ -1039,7 +1025,7 @@ class Foo(Model):
         return Table(data=data, model=model, instance=instance, columns=columns, **kwargs)
 
     def endpoint_dispatch(self, key, value):
-        parts = key.split('__', 1)
+        parts = key.split(DISPATCH_PATH_SEPARATOR, 1)
         prefix = parts.pop(0)
         remaining_key = parts[0] if parts else None
         for endpoint, handler in self.endpoint.items():
@@ -1068,7 +1054,6 @@ def table_context(request,
                   paginate_by=None,
                   page=None,
                   extra_context=None,
-                  context_processors=None,
                   paginator=None,
                   show_hits=False,
                   hit_label='Items'):
@@ -1141,7 +1126,7 @@ def table_context(request,
             'is_paginated': False})
 
     base_context.update(extra_context)
-    return RequestContext(request, base_context, context_processors)
+    return base_context
 
 
 def set_row_span(rowspan_by_row):
@@ -1164,7 +1149,6 @@ def render_table(request,
                  blank_on_empty=False,
                  paginate_by=40,  # pragma: no mutate
                  page=None,
-                 context_processors=None,
                  paginator=None,
                  show_hits=False,
                  hit_label='Items',
@@ -1191,19 +1175,9 @@ def render_table(request,
     table.prepare(request)
     assert isinstance(table, Table)
 
-    for key, value in request.GET.items():
-        if key.startswith('__'):
-            remaining_key = key[2:]
-            expected_prefix = table.endpoint_dispatch_prefix
-            if expected_prefix is not None:
-                parts = remaining_key.split('__', 1)
-                prefix = parts.pop(0)
-                if prefix != expected_prefix:
-                    return
-                remaining_key = parts[0] if parts else None
-            data = table.endpoint_dispatch(key=remaining_key, value=value)
-            if data is not None:
-                return HttpResponse(json.dumps(data), content_type='application/json')
+    should_return, dispatch_result = handle_dispatch(request=request, obj=table)
+    if should_return:
+        return dispatch_result
 
     context['bulk_form'] = table.bulk_form
     context['query_form'] = table.query_form
@@ -1235,7 +1209,6 @@ def render_table(request,
         paginate_by=paginate_by,
         page=page,
         extra_context=context,
-        context_processors=context_processors,
         paginator=paginator,
         show_hits=show_hits,
         hit_label=hit_label,
@@ -1251,10 +1224,7 @@ def render_table(request,
     if not template:
         template = template_name
 
-    if isinstance(template, six.string_types):
-        return get_template(template).render(table.context)
-    else:
-        return template.render(table.context)
+    return render_template(request, template, table.context)
 
 
 def render_table_to_response(*args, **kwargs):

lib/tri/table/templates/tri_table/table_container.html

@@ -5,11 +5,15 @@
     {% include "tri_table/table.html" %}
 
     {% if bulk_form %}
-        <table class="newforms">
+        <table {{ bulk_form.render_attrs }}>
             {{ bulk_form }}
-        </table>
 
-        <input type="submit" class="button" value="Bulk change"/>
+            <tr>
+                <td colspan="99">
+                    <input type="submit" class="button" value="Bulk change"/>
+                </td>
+            </tr>
+        </table>
     {% endif %}
 
     {{ table.render_links }}

requirements.txt

@@ -1,6 +1,6 @@
 tri.declarative >=0.28.0
 tri.named_struct
-tri.form >=4.0.0, <5.0.0
+tri.form >=4.7.1, <5.0.0
 tri.struct
 tri.query >=3.1.0, <4.0.0
 six

setup.py

@@ -78,7 +78,7 @@ def run(self):
     packages=find_packages('lib'),
     package_dir={'': 'lib'},
     include_package_data=True,
-    install_requires=['Django >= 1.7'] + read_reqs('requirements.txt'),
+    install_requires=['Django >= 1.8'] + read_reqs('requirements.txt'),
     license="BSD",
     zip_safe=False,
     keywords='tri.table',

tests/helpers.py

@@ -16,6 +16,11 @@ def reindent_line(line):
     return "\n".join(reindent_line(line) for line in s.splitlines())
 
 
+def remove_csrf(html_code):
+    csrf_regex = r'<input[^>]+csrfmiddlewaretoken[^>]+>'
+    return re.sub(csrf_regex, '', html_code)
+
+
 def verify_table_html(expected_html, query=None, find=None, links=None, **kwargs):
     """
     Verify that the table renders to the expected markup, modulo formatting
@@ -27,10 +32,9 @@ def verify_table_html(expected_html, query=None, find=None, links=None, **kwargs
 
     request = RequestFactory().get("/", query)
     request.user = AnonymousUser()
-    request.META['CSRF_COOKIE'] = None
-    actual_html = render_table(request=request, links=links, **kwargs)
+    actual_html = remove_csrf(render_table(request=request, links=links, **kwargs))
 
-    prettified_expected = reindent(BeautifulSoup(expected_html).find(**find).prettify()).strip()
-    prettified_actual = reindent(BeautifulSoup(actual_html).find(**find).prettify()).strip()
+    prettified_expected = reindent(BeautifulSoup(expected_html, 'html.parser').find(**find).prettify()).strip()
+    prettified_actual = reindent(BeautifulSoup(actual_html, 'html.parser').find(**find).prettify()).strip()
 
     assert prettified_expected == prettified_actual, "{}\n !=\n {}".format(prettified_expected, prettified_actual)

tests/models.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 from django.db import models
+from django.db.models import CASCADE
 from django.utils.encoding import python_2_unicode_compatible
 
 
@@ -14,5 +15,5 @@ def __str__(self):
 
 
 class Bar(models.Model):
-    foo = models.ForeignKey(Foo)
+    foo = models.ForeignKey(Foo, on_delete=CASCADE)
     c = models.BooleanField()

tox.ini

@@ -1,10 +1,9 @@
 [tox]
-envlist = py27-django{17,18,19,110},pypy-django{17,18,19,110},py36-django18
+envlist = py27-django{18,19,110},pypy-django{18,19,110},py36-django18
 
 [testenv]
 commands = {envpython} -m pytest {posargs}
 deps =
-    django17: Django >= 1.7, <1.8
     django18: Django >= 1.8, <1.9
     django19: Django >= 1.9, <1.10
     django110: Django >= 1.10, <1.11