Changeset 802

Timestamp:

10/08/05 09:28:21 (3 years ago)

Author:

rjwittams

Message:

Fixed token parsing bug in the error stuff.
Reorganisation and rationalisation of helper objects for admin templates.

Files:

• django/branches/new-admin/django/conf/admin_templates/admin_change_form.html (modified) (1 diff)
• django/branches/new-admin/django/conf/admin_templates/admin_edit_inline_stacked.html (modified) (1 diff)
• django/branches/new-admin/django/conf/admin_templates/admin_field_line.html (moved) (moved from django/branches/new-admin/django/conf/admin_templates/admin_field.html) (3 diffs)
• django/branches/new-admin/django/conf/admin_templates/admin_field_widget.html (deleted)
• django/branches/new-admin/django/core/meta/fields.py (modified) (3 diffs)
• django/branches/new-admin/django/core/template.py (modified) (2 diffs)
• django/branches/new-admin/django/templatetags/admin_modify.py (modified) (8 diffs)
• django/branches/new-admin/django/views/admin/main.py (modified) (9 diffs)

django/branches/new-admin/django/conf/admin_templates/admin_change_form.html

@@ -51 +51 @@
-<b>
-</b>
-fieldset in admin_field
-field
-field
-field
+bound_field_set in bound_field_
+bound_field_
+bound_field_
+bound_field_
-    {% endif %}
-set in fieldset.bound_field_sets
-    {% for bound_field in bound_field_set
-    {% admin_field_bound bound_field
+line in bound_field_set
+   {% admin_field_line bound_field_line
+{% for bound_field in bound_field_line
-            {% filter_interface_script_maybe bound_field %} 
- 
+
-    {% endfor %}
-   </fieldset>

django/branches/new-admin/django/conf/admin_templates/admin_edit_inline_stacked.html

@@ -9 +9 @@
-            {% field_widget bound_field %}
-         {% else %}
-bound
+line
-         {% endif %}
-      {% endfor %}

django/branches/new-admin/django/conf/admin_templates/admin_field_line.html

@@ -1 @@
-
+ 
-   {% for bound_field in bound_fields %}
-      {{ bound_field.html_error_list }} 
-   {% endfor %}
-
+
-   {% for bound_field in bound_fields %}
-      {% if bound_field.has_label_first %}
@@ -17 +17 @@
-      {% if change %}
-         {% if bound_field.field.primary_key %}
-
-
+ 
+ 
-
-         {% if bound_field.raw_id_admin %}
@@ -32 +32 @@
-        </p>
-      {% endif %}
+
-   {% endfor %}
-
-</div>

django/branches/new-admin/django/core/meta/fields.py

@@ -787 +787 @@
-        self.raw_id_admin = raw_id_admin
-
+
+
+class BoundField(object):
+    def __init__(self, field, field_mapping, original):
+        self.field = field
+        self.form_fields = self.resolve_form_fields(field_mapping)
+        self.original = original
+
+    def resolve_form_fields(self, field_mapping):
+        return [field_mapping[name] for name in self.field.get_manipulator_field_names('')]
+
+    def as_field_list(self):
+        return [self.field]
+
+    def original_value(self):
+        return self.original.__dict__[self.field.name] 
+
+    def __repr__(self):
+        return "BoundField:(%s, %s)" %( self.field.name, self.form_fields)
+
+class BoundFieldLine(object):
+    def __init__(self, field_line, field_mapping, original, bound_field_class=BoundField):
+        self.bound_fields = [bound_field_class(field, field_mapping, original) for field in field_line]
+    
+    def __iter__(self):
+        for bound_field in self.bound_fields:
+            yield bound_field
+    
+    def __repr__(self):
+        return "%s:(%s)" % (self.__class__.__name__, self.bound_fields)
+    
+    def __len__(self):
+        return len(self.bound_fields)
+    
+class FieldLine(object):
+    def __init__(self, linespec, field_locator_func):
+        if isinstance(linespec, basestring):
+            self.fields = [field_locator_func(linespec)]
+        else:
+            self.fields = [field_locator_func(field_name) for field_name in linespec]
+
+    def bind(self, field_mapping, original, bound_field_line_class=BoundFieldLine):
+        return bound_field_line_class(self, field_mapping, original)
+
+    def __iter__(self):
+        for field in self.fields:
+            yield field
+    
+    def __len__(self):
+        return len(self.fields)    
+    
+class BoundFieldSet(object):
+    def __init__(self, field_set, field_mapping, original, bound_field_line_class=BoundFieldLine):
+        self.name = field_set.name
+        self.classes = field_set.classes
+        self.bound_field_lines = [ field_line.bind(field_mapping,original, bound_field_line_class) 
+                                   for field_line in field_set]
+    def __repr__(self):
+        return "%s:(%s,%s)" % (self.__class__.__name__, self.name, self.bound_field_lines)
+
+    def __iter__(self):
+        for bound_field_line in self.bound_field_lines:
+            yield bound_field_line
+   
+    def __len__(self):
+        return len(self.bound_field_lines)
+   
+class FieldSet(object):
+    def __init__(self, name, classes, field_lines):
+        self.name = name
+        self.field_lines = field_lines
+        self.classes = classes
+        
+    def __repr__(self):
+         return "FieldSet:(%s,%s)" % (self.name, self.field_lines)
+
+    def bind(self, field_mapping, original, bound_field_set_class=BoundFieldSet):
+        return bound_field_set_class(self, field_mapping, original)
+
+    def __iter__(self):
+        for field_line in self.field_lines:
+            yield field_line
+
+    def __len__(self):
+        return len(self.field_lines)
+
+
-class Admin:
-    def __init__(self, fields=None, js=None, list_display=None, list_filter=None, date_hierarchy=None,
@@ -809 +896 @@
-        fields is a list of subclasses of Field. 
-
-
+TODO:
-        """
-        if self.fields is None:
@@ -828 +915 @@
-            new_fieldset_list.append(new_fieldset)
-        return new_fieldset_list
+    
+    def get_field_sets(self, opts):
+        if self.fields is None:
+            field_struct = ((None, {
+                    'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, AutoField)]
+                    }),)
+        else:
+            field_struct = self.fields
+            
+        
+        new_fieldset_list = []
+        for fieldset in field_struct:
+            name = fieldset[0]
+            fs_options = fieldset[1]
+            classes =  fs_options.get('classes', None)
+            line_specs = fs_options['fields']
+            field_lines = [FieldLine(line_spec, opts.get_field) for line_spec in line_specs]
+            new_fieldset_list.append(FieldSet(name, classes, field_lines) )
+        return new_fieldset_list
+        

django/branches/new-admin/django/core/template.py

@@ -114 +114 @@
-        "Compilation stage"
-        self.nodelist = compile_string(template_string, filename)
+        from pprint import pprint, pformat
+        print "------------------------"
+        print filename
+        pprint(self.nodelist)
+        print "------------------------"
-
-    def __iter__(self):
@@ -213 +218 @@
-        while linebreaks and line != lastline and linebreaks[line] <= upto:
-           line += 1
+    
+    last_bit = template_string[upto:]
+    if len(last_bit):
+        token_tups.append( (last_bit, line) )
+ 
- 
-    return [ create_token(tok, (filename, line)) for tok, line in token_tups]

django/branches/new-admin/django/templatetags/admin_modify.py

@@ -9 +9 @@
-
-from django.views.admin.main import AdminBoundField
+from django.core.meta.fields import BoundField
-import re
-
@@ -25 +26 @@
-#@inclusion_tag('admin_submit_line', takes_context=True)
-def submit_row(context):        
-    
-       
-       
-       
-      
-       
-    
-       
-    
-       
-    
-    
-    
-    
-    
-    
-    
-    
+
+    
+    
+    
+   
+    
+
+
+
+    
+
+
+
+
+
+
+
+
-
-srdec = inclusion_tag('admin_submit_line', takes_context=True)
@@ -119 +120 @@
-
-class FormFieldCollectionWrapper(object):
-obj
-obj = obj
+field_mapping
+field_mapping = field_mapping
-        self.fields = fields
-obj['original'],  True, self.obj
+self.field_mapping, field_mapping['original']
-
-    def showurl(self):
@@ -146 +147 @@
-        return output
-
-       
-    def fill_context(self, relation, add, change, context):
-        field_wrapper_list = relation.editable_fields(FieldWrapper)
@@ -155 +155 @@
-        form_field_collections = form[relation.opts.module_name]
-        fields = relation.editable_fields()
-o,fields) for o
+field_mapping ,fields) for field_mapping
-   
-        context['field_wrapper_list'] = field_wrapper_list
@@ -161 +161 @@
-        context['num_headers'] = len(field_wrapper_list)
-        context['original_row_needed'] = max([fw.use_raw_id_admin() for fw in field_wrapper_list]) 
-#        context['name_prefix'] = "%s." % (var_name,)
-
-
@@ -216 +215 @@
-    register_one_arg_tag(node)    
-
-
-
-bound
-list
-argument_val
+
+_line
+line
+BoundField
+[argument_val]
-    else:
-
+bf for bf in 
-    add = context['add']
-    change = context['change']
@@ -237 +236 @@
-        class_names.append('checkbox-row')
-
- 
+
-        'add' : context['add'],
-        'change' : context['change'],
-        'bound_fields' :  bound_fields, 
-        'class_names' : " ".join(class_names)
- 
-
-
-
-bound = afbdec(admin_field_bound
-
-
+
+
+
+_line
+line = afbdec(admin_field_line
+
+

django/branches/new-admin/django/views/admin/main.py

@@ -2 +2 @@
-
-from django.core import formfields, meta, template_loader, template
+from django.core.meta.fields import BoundField, BoundFieldLine, BoundFieldSet
-from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied
-from django.core.extensions import DjangoContext as Context
@@ -540 +541 @@
-    return js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-class AdminBoundField(BoundField):
-original, rel, field_mapping
-original, rel, field_mapping
+field_mapping, original
+field_mapping,original
-
-        self.element_id = self.form_fields[0].get_id() 
@@ -578 +564 @@
-        self._repr_filled = False
-    
-
-       
-    def _fetch_existing_repr(self, func_name):
-        class_dict = self.original.__class__.__dict__
@@ -592 +576 @@
-             func_name = 'get_%s' % self.field.name
-             self._repr = self._fetch_existing_repr(func_name)
-       
-       
- 
+        
+       
+
-        self._repr_filled = True
-             
@@ -608 +592 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-def fill_extra_context(opts, app_label, context, add=False, change=False, show_delete=False, form_url=''):
-    admin_field_objs = opts.admin.get_field_objs(opts)
@@ -634 +609 @@
-    auto_populated_fields = [f for f in opts.fields if f.prepopulate_from]
- 
-
+ 
-    
-    if ordered_objects:
@@ -647 +622 @@
-    form = context['form']
-    original = context['original']
-
+
+
+
-    inline_related_objects = opts.get_inline_related_objects_wrapped()
-    
@@ -654 +631 @@
-    extra_context = {
-        'add': add, 
-
-
+
-        'ordered_objects' : ordered_objects, 
+        'ordered_object_names' : ordered_object_names,
-        'auto_populated_fields' : auto_populated_fields,
-        'javascript_imports' : javascript_imports, 
@@ -662 +639 @@
-        'has_absolute_url': has_absolute_url, 
-        'form_enc_attrib': form_enc_attrib,
- 
-admin_fieldsets' : admin_fieldsets, 
+
+bound_field_sets' : bound_field_sets,
-        'inline_related_objects': inline_related_objects,
-        'ordered_object_names' : ordered_object_names, 
-        'content_type_id' : opts.get_content_type_id(),
-        'save_on_top' : opts.admin.save_on_top,