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

newforms-admin: Changed ModelAdmin.get_field_sets() so that it doesn't take an opts argument

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-19 05:10:51 +00:00
parent 2ea6cdbd9d
commit 13da9d7d2f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,9 @@ class ModelAdmin(object):
else: else:
return self.change_view(request, unquote(url)) return self.change_view(request, unquote(url))
def get_field_sets(self, opts): def get_field_sets(self):
"Returns a list of AdminFieldSet objects." "Returns a list of AdminFieldSet objects."
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)]}),)
else: else:

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

@ -170,7 +170,7 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
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(opts) 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['form'], original, AdminBoundFieldSet) for field_set in field_sets] bound_field_sets = [field_set.bind(context['form'], original, AdminBoundFieldSet) for field_set in field_sets]
first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id(); first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id();