mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Removed AdminBoundFieldLine and AdminBoundFieldSet

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-21 00:23:14 +00:00
parent 1fc252e087
commit dd2f22faad
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/admin/views/auth.py
View File

@ -37,7 +37,6 @@ def user_add_stage(request):
'has_file_field': False, 'has_file_field': False,
'has_absolute_url': False, 'has_absolute_url': False,
'auto_populated_fields': (), 'auto_populated_fields': (),
'bound_field_sets': (),
'opts': User._meta, 'opts': User._meta,
'username_help_text': User._meta.get_field('username').help_text, 'username_help_text': User._meta.get_field('username').help_text,
}, context_instance=template.RequestContext(request)) }, context_instance=template.RequestContext(request))

30
django/contrib/admin/views/main.py
View File

@ -138,41 +138,12 @@ class AdminBoundField(object):
return url_method() return url_method()
return '' 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=''): def render_change_form(model_admin, model, manipulator, context, add=False, change=False, form_url=''):
opts = model._meta opts = model._meta
app_label = opts.app_label app_label = opts.app_label
auto_populated_fields = [f for f in opts.fields if f.prepopulate_from] auto_populated_fields = [f for f in opts.fields if f.prepopulate_from]
field_sets = model_admin.get_field_sets() field_sets = model_admin.get_field_sets()
original = getattr(manipulator, 'original_object', None) 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() ordered_objects = opts.get_ordered_objects()
inline_related_objects = opts.get_followed_related_objects(manipulator.follow) inline_related_objects = opts.get_followed_related_objects(manipulator.follow)
extra_context = { extra_context = {
@ -183,7 +154,6 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
'has_file_field': opts.has_field_type(models.FileField), 'has_file_field': opts.has_field_type(models.FileField),
'has_absolute_url': hasattr(model, 'get_absolute_url'), 'has_absolute_url': hasattr(model, 'get_absolute_url'),
'auto_populated_fields': auto_populated_fields, 'auto_populated_fields': auto_populated_fields,
'bound_field_sets': bound_field_sets,
'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets), 'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets),
'ordered_objects': ordered_objects, 'ordered_objects': ordered_objects,
'inline_related_objects': inline_related_objects, 'inline_related_objects': inline_related_objects,