mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Small cleanup of AdminOptions, AdminFieldSet, AdminFieldLine

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-21 06:04:21 +00:00
parent 6505ae5c2f
commit 8e1e0adfc7
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
django/db/models/options.py
View File

@ -212,8 +212,9 @@ class Options:
return self._field_types[field_type] return self._field_types[field_type]
class AdminOptions: class AdminOptions:
def __init__(self, fields=None, js=None, list_display=None, list_filter=None, date_hierarchy=None, def __init__(self, fields=None, js=None, list_display=None, list_filter=None,
save_as=False, ordering=None, search_fields=None, save_on_top=False, list_select_related=False): date_hierarchy=None, save_as=False, ordering=None, search_fields=None,
save_on_top=False, list_select_related=False):
self.fields = fields self.fields = fields
self.js = js or [] self.js = js or []
self.list_display = list_display or ['__repr__'] self.list_display = list_display or ['__repr__']
@ -225,41 +226,21 @@ class AdminOptions:
self.list_select_related = list_select_related self.list_select_related = list_select_related
def get_field_sets(self, opts): def get_field_sets(self, opts):
"Returns a list of AdminFieldSet objects for this AdminOptions object."
if self.fields is None: if self.fields is None:
field_struct = ((None, { field_struct = ((None, {'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, AutoField)]}),)
'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, AutoField)]
}),)
else: else:
field_struct = self.fields field_struct = self.fields
new_fieldset_list = [] new_fieldset_list = []
for fieldset in field_struct: for fieldset in field_struct:
name = fieldset[0]
fs_options = fieldset[1] fs_options = fieldset[1]
classes = fs_options.get('classes', ()) classes = fs_options.get('classes', ())
line_specs = fs_options['fields'] new_fieldset_list.append(AdminFieldSet(fieldset[0], classes, opts.get_field, fs_options['fields']))
new_fieldset_list.append(AdminFieldSet(name, classes, opts.get_field, line_specs))
return new_fieldset_list return new_fieldset_list
def contribute_to_class(self, cls, name): def contribute_to_class(self, cls, name):
cls._meta.admin = self cls._meta.admin = self
class AdminFieldLine(object):
def __init__(self, field_locator_func, linespec):
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):
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 AdminFieldSet(object): class AdminFieldSet(object):
def __init__(self, name, classes, field_locator_func, line_specs): def __init__(self, name, classes, field_locator_func, line_specs):
self.name = name self.name = name
@ -278,3 +259,20 @@ class AdminFieldSet(object):
def __len__(self): def __len__(self):
return len(self.field_lines) return len(self.field_lines)
class AdminFieldLine(object):
def __init__(self, field_locator_func, linespec):
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):
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)