Ticket #9093: inclusion_tag_using_template.diff

django/template/__init__.py

@@ -823 +823 @@
         raise TemplateSyntaxError(message)
     return node_class(bits)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class Library(object):
     def __init__(self):
         self.filters = {}
@@ -886 +901 @@
             def render(self, context):
                 resolved_vars = [var.resolve(context) for var in self.vars_to_resolve]
                 return func(*resolved_vars)
-
+        
         compile_func = curry(generic_tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, SimpleNode)
         compile_func.__doc__ = func.__doc__
         self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
         return func
 
-    def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
+    def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
         def dec(func):
             params, xx, xxx, defaults = getargspec(func)
             if takes_context:
@@ -900 +915 @@
                     params = params[1:]
                 else:
                     raise TemplateSyntaxError("Any tag function decorated with takes_context=True must have a first argument of 'context'")
+
+
+
 
-            class InclusionNode(Node):
-                def __init__(self, vars_to_resolve):
+            ):
+                
                     self.vars_to_resolve = map(Variable, vars_to_resolve)
 
                 def render(self, context):
@@ -915 +933 @@
                     dict = func(*args)
 
                     if not getattr(self, 'nodelist', False):
+
+
                         from django.template.loader import get_template, select_template
                         if not isinstance(file_name, basestring) and is_iterable(file_name):
                             t = select_template(file_name)
@@ -923 +943 @@
                         self.nodelist = t.nodelist
                     return self.nodelist.render(context_class(dict,
                             autoescape=context.autoescape))
-
-            compile_func = curry(generic_tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, InclusionNode)
+            
+            if allow_template_override:
+                tag_compiler = inclusion_tag_compiler
+            else:
+                tag_compiler = generic_tag_compiler
+            compile_func = curry(tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, InclusionNode)
             compile_func.__doc__ = func.__doc__
             self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
             return func
         return dec
 
+
 def get_library(module_name):
     lib = libraries.get(module_name, None)
     if not lib:

docs/howto/custom-template-tags.txt

@@ -706 +706 @@
 the tag is passed the context object, as in this example. That's the only
 difference between this case and the previous ``inclusion_tag`` example.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Setting a variable in the context
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~