diff options
| -rw-r--r-- | django/contrib/admin/templates/admin/change_form.html | 4 | ||||
| -rw-r--r-- | django/contrib/admin/templatetags/admin_modify.py | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index d0cce130db..8a6a4f9414 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -62,8 +62,8 @@ {% block after_field_sets %}{% endblock %} -{% for bound_inline in bound_inlines %} - {% render_inline bound_inline %} +{% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} {% endfor %} {% block after_related_objects %}{% endblock %} diff --git a/django/contrib/admin/templatetags/admin_modify.py b/django/contrib/admin/templatetags/admin_modify.py index f8ee936c3c..44ee2e55dd 100644 --- a/django/contrib/admin/templatetags/admin_modify.py +++ b/django/contrib/admin/templatetags/admin_modify.py @@ -105,20 +105,3 @@ def field_widget(parser, token): raise template.TemplateSyntaxError, "%s takes 1 argument" % bits[0] return FieldWidgetNode(bits[1]) field_widget = register.tag(field_widget) - -class InlineNode(template.Node): - def __init__(self, inline_var): - self.inline_var = inline_var - - def render(self, context): - inline = context[self.inline_var] - t = loader.get_template(inline.template) - output = t.render(context) - return output - -def render_inline(parser, token): - bits = token.contents.split() - if len(bits) != 2: - raise template.TemplateSyntaxError, "%s takes 1 argument" % bits[0] - return InlineNode(bits[1]) -render_inline = register.tag(render_inline) |