Ticket #10590: nested_fieldsets.diff

django/contrib/admin/helpers.py

@@ -41 +41 @@
-    media = property(_media)
-
-class Fieldset(object):
-
+
+
-        self.form = form
-        self.name, self.fields = name, fields
-        self.classes = u' '.join(classes)
-        self.description = description
+        self.level = level
-
-    def _media(self):
-        if 'collapse' in self.classes:
@@ -55 +57 @@
-
-    def __iter__(self):
-        for field in self.fields:
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-class Fieldline(object):
-    def __init__(self, form, field):
@@ -175 +188 @@
-        for field in self.fields:
-            if fk and fk.name == field:
-                continue
-
+
+
+
+
+
+
+
+
+
+
+
+
-            
-class AdminErrorList(forms.util.ErrorList):
-    """

django/contrib/admin/media/css/forms.css

@@ -123 +123 @@
-    width: 450px;
-}
-
+/* NESTED FIELDSETS */
+
+fieldset fieldset {
+    margin: 10px;
+}
+
-/* COLLAPSED FIELDSETS */
-
-fieldset.collapsed * {

django/contrib/admin/templates/admin/includes/fieldset.html

@@ -1 +1 @@
-<fieldset class="module aligned {{ fieldset.classes }}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</fieldset>

django/contrib/admin/util.py

@@ -47 +47 @@
-    field_names = []
-    for name, opts in fieldsets:
-        for field in opts['fields']:
-
-
-
+
+
+
+
+
+
+
-            else:
+                # it's a field name
-                field_names.append(field)
-    return field_names
-

django/template/defaulttags.py

@@ -8 +8 @@
-except NameError:
-    from django.utils.itercompat import reversed     # Python 2.3 fallback
-
+from django.template import loader, RequestContext, Template
-from django.template import Node, NodeList, Template, Context, Variable
-from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END
-from django.template import get_library, Library, InvalidTemplateLibrary
@@ -432 +433 @@
-        context.pop()
-        return output
-
+class ParsedIncludeNode(Node):
+    def __init__(self, tag_name, template_path, extra):
+        self.tag_name = tag_name
+        self.template_path = template_path
+        self.extra = extra
+    def render(self, context):
+        template_path = self.template_path.resolve(context)
+        context_vars = {}
+        for d in list(context):
+            for var, val in d.items():
+                context_vars[var] = val
+        for var, val in self.extra:
+            context_vars[var] = val.resolve(context)
+        return loader.render_to_string(template_path, context_vars)
+
-#@register.tag
-def autoescape(parser, token):
-    """
@@ -1171 +1187 @@
-    parser.delete_first_token()
-    return WithNode(var, name, nodelist)
-do_with = register.tag('with', do_with)
+
+#@register.tag
+def do_include_parsed(parser, token):
+    """
+    Parses the defined template with the current context variables and also the ones passed to the template tag. The included template might extend some other template.
+
+    Usage::
+
+        {% include_parsed <template_path> [with <value1> as <variable1>[ and <value2> as <variable2>[ and ...]] %}
+    
+    Examples::
+
+        {% include_parsed "people/item_person.html" %}
+        {% include_parsed path with membership.user.get_profile as person and membership.persongroup as persongroup %}
+
+    """    
+    bits = token.split_contents()
+    tag_name = bits.pop(0)
+    try:
+        template_path = bits.pop(0)
+        extra = [] # a tuple of variables names and values to parse before passing to the template
+        if bits:
+            bits.pop(0) # remove the word "with"
+            while bits:
+                val = bits.pop(0)
+                bits.pop(0) # remove the word "as"
+                var = bits.pop(0)
+                extra.append((var, parser.compile_filter(val)))
+                if bits:
+                    bits.pop(0) # remove the word "and"
+                    
+    except ValueError:
+        raise template.TemplateSyntaxError, "include_parsed tag requires a following syntax: {% include_parsed <template_path> [with <value1> as <variable1>[ and <value2> as <variable2>[ and ...]] %}"
+    return ParsedIncludeNode(parser.compile_filter(tag_name), parser.compile_filter(template_path), extra)
+    
+do_include_parsed = register.tag('include_parsed', do_include_parsed)
+