Changeset 4376

Timestamp:

01/20/07 18:23:14 (2 years ago)

Author:

adrian

Message:

newforms-admin: Removed AdminBoundFieldLine? and AdminBoundFieldSet?

Files:

• django/branches/newforms-admin/django/contrib/admin/views/auth.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/views/main.py (modified) (3 diffs)

django/branches/newforms-admin/django/contrib/admin/views/auth.py

@@ -38 +38 @@
-        'has_absolute_url': False,
-        'auto_populated_fields': (),
-        'bound_field_sets': (),
-        'opts': User._meta,
-        'username_help_text': User._meta.get_field('username').help_text,

django/branches/newforms-admin/django/contrib/admin/views/main.py

@@ -139 +139 @@
-        return ''
-
-class AdminBoundFieldLine(object):
-    def __init__(self, field_line, field_mapping, original):
-        self.bound_fields = [field.bind(field_mapping, original, AdminBoundField) for field in field_line]
-        for bound_field in self:
-            bound_field.first = True
-            break
-
-    def __iter__(self):
-        for bound_field in self.bound_fields:
-            yield bound_field
-
-    def __len__(self):
-        return len(self.bound_fields)
-
-class AdminBoundFieldSet(object):
-    def __init__(self, field_set, field_mapping, original):
-        self.name = field_set.name
-        self.classes = field_set.classes
-        self.description = field_set.description
-        self.bound_field_lines = [field_line.bind(field_mapping, original, AdminBoundFieldLine) for field_line in field_set]
-
-    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)
-
-def render_change_form(model_admin, model, manipulator, context, add=False, change=False, form_url=''):
-    opts = model._meta
@@ -173 +145 @@
-    field_sets = model_admin.get_field_sets()
-    original = getattr(manipulator, 'original_object', None)
-    bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets]
-    ordered_objects = opts.get_ordered_objects()
-    inline_related_objects = opts.get_followed_related_objects(manipulator.follow)
@@ -184 +155 @@
-        'has_absolute_url': hasattr(model, 'get_absolute_url'),
-        'auto_populated_fields': auto_populated_fields,
-        'bound_field_sets': bound_field_sets,
-        'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets),
-        'ordered_objects': ordered_objects,