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: Renamed some variables in AdminFieldSet and AdminFieldLine purely for the purpose of comprehending this spaghetti better

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-19 05:33:08 +00:00
parent eaf6d51611
commit 7227d41f48
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/admin/options.py
View File

@ -31,9 +31,9 @@ def unquote(s):
return "".join(res) return "".join(res)
class AdminFieldSet(object): class AdminFieldSet(object):
def __init__(self, name, classes, field_locator_func, line_specs, description): def __init__(self, name, classes, field_locator_func, field_list, description):
self.name = name self.name = name
self.field_lines = [AdminFieldLine(field_locator_func, line_spec) for line_spec in line_specs] self.field_lines = [AdminFieldLine(field_locator_func, field) for field in field_list]
self.classes = classes self.classes = classes
self.description = description self.description = description
@ -51,11 +51,11 @@ class AdminFieldSet(object):
return len(self.field_lines) return len(self.field_lines)
class AdminFieldLine(object): class AdminFieldLine(object):
def __init__(self, field_locator_func, linespec): def __init__(self, field_locator_func, field_name):
if isinstance(linespec, basestring): if isinstance(field_name, basestring):
self.fields = [field_locator_func(linespec)] self.fields = [field_locator_func(field_name)]
else: else:
self.fields = [field_locator_func(field_name) for field_name in linespec] self.fields = [field_locator_func(name) for name in field_name]
def bind(self, field_mapping, original, bound_field_line_class): def bind(self, field_mapping, original, bound_field_line_class):
return bound_field_line_class(self, field_mapping, original) return bound_field_line_class(self, field_mapping, original)
@ -113,7 +113,7 @@ class ModelAdmin(object):
return self.change_view(request, unquote(url)) return self.change_view(request, unquote(url))
def get_field_sets(self): def get_field_sets(self):
"Returns a list of AdminFieldSet objects." "Returns a list of AdminFieldSet objects according to self.fields."
opts = self.opts opts = self.opts
if self.fields is None: 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, models.AutoField)]}),) field_struct = ((None, {'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, models.AutoField)]}),)
@ -123,8 +123,7 @@ class ModelAdmin(object):
for name, options in field_struct: for name, options in field_struct:
classes = options.get('classes', ()) classes = options.get('classes', ())
description = options.get('description', '') description = options.get('description', '')
new_fieldset_list.append(AdminFieldSet(name, classes, new_fieldset_list.append(AdminFieldSet(name, classes, opts.get_field, options['fields'], description))
opts.get_field, options['fields'], description))
return new_fieldset_list return new_fieldset_list
def has_add_permission(self, request): def has_add_permission(self, request):