Ticket #9093: inclusion_tag_using_template3.diff

File inclusion_tag_using_template3.diff, 4.7 KB (added by exogen@…, 7 years ago)

Fixed diff whitespace, docs typos

  • django/template/__init__.py

     
    823823        raise TemplateSyntaxError(message)
    824824    return node_class(bits)
    825825
     826def inclusion_tag_compiler(params, defaults, name, node_class, parser, token):
     827    "Returns an InclusionNode."
     828    bits = token.split_contents()[1:]
     829    using_template = [] # Allow multiple templates via select_template.
     830    try:
     831        using_index = bits.index('using')
     832    except ValueError:
     833        pass
     834    else:
     835        if using_index != len(bits) - 1:
     836            # Get everything after the 'using' keyword.
     837            using_template[:] = bits[using_index + 1:]
     838            bits = bits[:using_index]
     839    return node_class(bits, using_template)
     840
    826841class Library(object):
    827842    def __init__(self):
    828843        self.filters = {}
     
    892907        self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
    893908        return func
    894909
    895     def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
     910    def inclusion_tag(self, file_name, context_class=Context, takes_context=False, allow_template_override=True):
    896911        def dec(func):
    897912            params, xx, xxx, defaults = getargspec(func)
    898913            if takes_context:
     
    900915                    params = params[1:]
    901916                else:
    902917                    raise TemplateSyntaxError("Any tag function decorated with takes_context=True must have a first argument of 'context'")
     918            class InclusionNode(Node):
     919                default_template = file_name
    903920
    904             class InclusionNode(Node):
    905                 def __init__(self, vars_to_resolve):
     921                def __init__(self, vars_to_resolve, using_template=()):
     922                    self.using_template = map(Variable, using_template)
    906923                    self.vars_to_resolve = map(Variable, vars_to_resolve)
    907924
    908925                def render(self, context):
     
    915932                    dict = func(*args)
    916933
    917934                    if not getattr(self, 'nodelist', False):
     935                        using_template = [var.resolve(context) for var in self.using_template]
     936                        file_name = using_template or self.default_template
    918937                        from django.template.loader import get_template, select_template
    919938                        if not isinstance(file_name, basestring) and is_iterable(file_name):
    920939                            t = select_template(file_name)
     
    923942                        self.nodelist = t.nodelist
    924943                    return self.nodelist.render(context_class(dict,
    925944                            autoescape=context.autoescape))
    926 
    927             compile_func = curry(generic_tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, InclusionNode)
     945           
     946            if allow_template_override:
     947                tag_compiler = inclusion_tag_compiler
     948            else:
     949                tag_compiler = generic_tag_compiler
     950            compile_func = curry(tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, InclusionNode)
    928951            compile_func.__doc__ = func.__doc__
    929952            self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
    930953            return func
  • docs/howto/custom-template-tags.txt

     
    706706the tag is passed the context object, as in this example. That's the only
    707707difference between this case and the previous ``inclusion_tag`` example.
    708708
     709Sometimes you may wish to use an inclusion tag with a template other than the
     710one specified in ``register.inclusion_tag()``. Inclusion tags offer the
     711following syntax for this scenario:
     712
     713.. code-block:: html+django
     714
     715    {% show_results poll using "custom/results.html" %}
     716
     717This will use the template found at ``custom/results.html`` instead of the
     718default of ``results.html`` (specified when the inclusion tag was registered).
     719Multiple templates may be provided with this syntax -- Django's template loader
     720will select which one to use:
     721
     722.. code-block:: html+django
     723
     724    {% show_results poll using "site/results.html" "app/results.html" %}
     725
     726To disallow overriding the template for your inclusion tag, specify
     727``allow_template_override=False`` in ``register.inclusion_tag()``:
     728
     729    register.inclusion_tag('results.html', allow_template_override=False)(show_results)
     730
    709731Setting a variable in the context
    710732~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    711733
Back to Top