diff options
| author | Paulo Alvarado <commonzenpython@gmail.com> | 2018-05-18 19:50:58 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-05-18 19:50:58 -0400 |
| commit | ffb72a95bcd6fc5cce7915f3b3732a05837f29a2 (patch) | |
| tree | 861b9ee2aaaf19339afe93ff8c9488de11cd405f /django | |
| parent | a7bc1aea03508f544c9dfac0f34b01996653cef4 (diff) | |
Fixed #29414 -- Restored form inputs on admin inlines when the user doesn't have the change permission.
Regression in 825f0beda804e48e9197fcf3b0d909f9f548aa47.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/helpers.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 8bb3df7c43..5e8e0caf69 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -244,9 +244,10 @@ class InlineAdminFormSet: self.has_view_permission = has_view_permission def __iter__(self): - readonly_fields_for_editing = self.readonly_fields - if not self.has_change_permission: - readonly_fields_for_editing += flatten_fieldsets(self.fieldsets) + if self.has_change_permission: + readonly_fields_for_editing = self.readonly_fields + else: + readonly_fields_for_editing = self.readonly_fields + flatten_fieldsets(self.fieldsets) for form, original in zip(self.formset.initial_forms, self.formset.get_queryset()): view_on_site_url = self.opts.get_view_on_site_url(original) |