diff options
| author | Daniel Hahler <git@thequod.de> | 2020-01-17 16:00:04 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-01-17 16:00:04 +0100 |
| commit | 68e018010befe78b937b0a6cf045f1a12ed26fca (patch) | |
| tree | 4049924fe6987b5c3b8be1ab2a29b1b54b1546a4 | |
| parent | 26be53dd89cef46746b4a67cbc0bb29665e999a6 (diff) | |
Optimized ModelAdmin._changeform_view() by avoiding multiple get_fieldsets() calls.
Co-authored-by: Hasan Ramezani <hasan.r67@gmail.com>
| -rw-r--r-- | django/contrib/admin/options.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 795d20f96a..a0429a0e84 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1552,7 +1552,10 @@ class ModelAdmin(BaseModelAdmin): if obj is None: return self._get_obj_does_not_exist_redirect(request, opts, object_id) - ModelForm = self.get_form(request, obj, change=not add) + fieldsets = self.get_fieldsets(request, obj) + ModelForm = self.get_form( + request, obj, change=not add, fields=flatten_fieldsets(fieldsets) + ) if request.method == 'POST': form = ModelForm(request.POST, request.FILES, instance=obj) form_validated = form.is_valid() @@ -1583,12 +1586,12 @@ class ModelAdmin(BaseModelAdmin): formsets, inline_instances = self._create_formsets(request, obj, change=True) if not add and not self.has_change_permission(request, obj): - readonly_fields = flatten_fieldsets(self.get_fieldsets(request, obj)) + readonly_fields = flatten_fieldsets(fieldsets) else: readonly_fields = self.get_readonly_fields(request, obj) adminForm = helpers.AdminForm( form, - list(self.get_fieldsets(request, obj)), + list(fieldsets), # Clear prepopulated fields on a view-only form to avoid a crash. self.get_prepopulated_fields(request, obj) if add or self.has_change_permission(request, obj) else {}, readonly_fields, |