From 13da9d7d2fd689564e9f14773e710b081db5a6f0 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 19 Jan 2007 05:10:51 +0000 Subject: [PATCH] newforms-admin: Changed ModelAdmin.get_field_sets() so that it doesn't take an opts argument git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4354 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 3 ++- django/contrib/admin/views/main.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 6b17dbbb60..487b13ecee 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -112,8 +112,9 @@ class ModelAdmin(object): else: return self.change_view(request, unquote(url)) - def get_field_sets(self, opts): + def get_field_sets(self): "Returns a list of AdminFieldSet objects." + opts = self.opts 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)]}),) else: diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 908aee74dd..886999270c 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -170,7 +170,7 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan opts = model._meta app_label = opts.app_label 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) 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();