Fixed #21064 -- Refactored common logic in ModelAdmin.add_view and change_view.
This commit is contained in:
Adam Avramov
Tim Graham
parent
8aa1efff6d
commit
390001ce52
|
|
@ -1055,7 +1055,8 @@ class ModelAdmin(BaseModelAdmin):
|
|||
'save_as': self.save_as,
|
||||
'save_on_top': self.save_on_top,
|
||||
'to_field_var': TO_FIELD_VAR,
|
||||
'is_popup_var': IS_POPUP_VAR
|
||||
'is_popup_var': IS_POPUP_VAR,
|
||||
'app_label': app_label,
|
||||
})
|
||||
if add and self.add_form_template is not None:
|
||||
form_template = self.add_form_template
|
||||
|
|
@ -1295,32 +1296,68 @@ class ModelAdmin(BaseModelAdmin):
|
|||
"admin/delete_confirmation.html"
|
||||
], context, current_app=self.admin_site.name)
|
||||
|
||||
def get_inline_formsets(self, request, formsets, inline_instances,
|
||||
obj=None):
|
||||
inline_admin_formsets = []
|
||||
for inline, formset in zip(inline_instances, formsets):
|
||||
fieldsets = list(inline.get_fieldsets(request, obj))
|
||||
readonly = list(inline.get_readonly_fields(request, obj))
|
||||
prepopulated = dict(inline.get_prepopulated_fields(request, obj))
|
||||
inline_admin_formset = helpers.InlineAdminFormSet(inline, formset,
|
||||
fieldsets, prepopulated, readonly, model_admin=self)
|
||||
inline_admin_formsets.append(inline_admin_formset)
|
||||
return inline_admin_formsets
|
||||
|
||||
@csrf_protect_m
|
||||
@transaction.atomic
|
||||
def add_view(self, request, form_url='', extra_context=None):
|
||||
"The 'add' admin view for this model."
|
||||
def changeform_view(self, request, object_id=None, form_url='', extra_context=None):
|
||||
|
||||
model = self.model
|
||||
opts = model._meta
|
||||
add = object_id is None
|
||||
|
||||
if add:
|
||||
if not self.has_add_permission(request):
|
||||
raise PermissionDenied
|
||||
obj = None
|
||||
|
||||
ModelForm = self.get_form(request)
|
||||
else:
|
||||
obj = self.get_object(request, unquote(object_id))
|
||||
|
||||
if not self.has_change_permission(request, obj):
|
||||
raise PermissionDenied
|
||||
|
||||
if obj is None:
|
||||
raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {
|
||||
'name': force_text(opts.verbose_name), 'key': escape(object_id)})
|
||||
|
||||
if request.method == 'POST' and "_saveasnew" in request.POST:
|
||||
return self.add_view(request, form_url=reverse('admin:%s_%s_add' % (
|
||||
opts.app_label, opts.model_name),
|
||||
current_app=self.admin_site.name))
|
||||
|
||||
ModelForm = self.get_form(request, obj)
|
||||
if request.method == 'POST':
|
||||
form = ModelForm(request.POST, request.FILES)
|
||||
form = ModelForm(request.POST, request.FILES, instance=obj)
|
||||
if form.is_valid():
|
||||
new_object = self.save_form(request, form, change=False)
|
||||
form_validated = True
|
||||
new_object = self.save_form(request, form, change=not add)
|
||||
else:
|
||||
form_validated = False
|
||||
new_object = form.instance
|
||||
formsets, inline_instances = self._create_formsets(request, new_object)
|
||||
if all_valid(formsets) and form_validated:
|
||||
self.save_model(request, new_object, form, False)
|
||||
self.save_related(request, form, formsets, False)
|
||||
self.save_model(request, new_object, form, not add)
|
||||
self.save_related(request, form, formsets, not add)
|
||||
if add:
|
||||
self.log_addition(request, new_object)
|
||||
return self.response_add(request, new_object)
|
||||
else:
|
||||
change_message = self.construct_change_message(request, form, formsets)
|
||||
self.log_change(request, new_object, change_message)
|
||||
return self.response_change(request, new_object)
|
||||
else:
|
||||
if add:
|
||||
# Prepare the dict of initial data from the request.
|
||||
# We have to special-case M2Ms as a list of comma-separated PKs.
|
||||
initial = dict(request.GET.items())
|
||||
|
|
@ -1333,97 +1370,24 @@ class ModelAdmin(BaseModelAdmin):
|
|||
initial[k] = initial[k].split(",")
|
||||
form = ModelForm(initial=initial)
|
||||
formsets, inline_instances = self._create_formsets(request, self.model())
|
||||
|
||||
adminForm = helpers.AdminForm(form, list(self.get_fieldsets(request)),
|
||||
self.get_prepopulated_fields(request),
|
||||
self.get_readonly_fields(request),
|
||||
model_admin=self)
|
||||
media = self.media + adminForm.media
|
||||
|
||||
inline_admin_formsets = []
|
||||
for inline, formset in zip(inline_instances, formsets):
|
||||
fieldsets = list(inline.get_fieldsets(request))
|
||||
readonly = list(inline.get_readonly_fields(request))
|
||||
prepopulated = dict(inline.get_prepopulated_fields(request))
|
||||
inline_admin_formset = helpers.InlineAdminFormSet(inline, formset,
|
||||
fieldsets, prepopulated, readonly, model_admin=self)
|
||||
inline_admin_formsets.append(inline_admin_formset)
|
||||
media = media + inline_admin_formset.media
|
||||
|
||||
context = dict(self.admin_site.each_context(),
|
||||
title=_('Add %s') % force_text(opts.verbose_name),
|
||||
adminform=adminForm,
|
||||
is_popup=(IS_POPUP_VAR in request.POST or
|
||||
IS_POPUP_VAR in request.GET),
|
||||
to_field=request.POST.get(TO_FIELD_VAR,
|
||||
request.GET.get(TO_FIELD_VAR)),
|
||||
media=media,
|
||||
inline_admin_formsets=inline_admin_formsets,
|
||||
errors=helpers.AdminErrorList(form, formsets),
|
||||
preserved_filters=self.get_preserved_filters(request),
|
||||
)
|
||||
context.update(extra_context or {})
|
||||
return self.render_change_form(request, context, form_url=form_url, add=True)
|
||||
|
||||
@csrf_protect_m
|
||||
@transaction.atomic
|
||||
def change_view(self, request, object_id, form_url='', extra_context=None):
|
||||
"The 'change' admin view for this model."
|
||||
model = self.model
|
||||
opts = model._meta
|
||||
|
||||
obj = self.get_object(request, unquote(object_id))
|
||||
|
||||
if not self.has_change_permission(request, obj):
|
||||
raise PermissionDenied
|
||||
|
||||
if obj is None:
|
||||
raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_text(opts.verbose_name), 'key': escape(object_id)})
|
||||
|
||||
if request.method == 'POST' and "_saveasnew" in request.POST:
|
||||
return self.add_view(request, form_url=reverse('admin:%s_%s_add' % (
|
||||
opts.app_label, opts.model_name),
|
||||
current_app=self.admin_site.name))
|
||||
|
||||
ModelForm = self.get_form(request, obj)
|
||||
if request.method == 'POST':
|
||||
form = ModelForm(request.POST, request.FILES, instance=obj)
|
||||
if form.is_valid():
|
||||
form_validated = True
|
||||
new_object = self.save_form(request, form, change=True)
|
||||
else:
|
||||
form_validated = False
|
||||
new_object = form.instance
|
||||
formsets, inline_instances = self._create_formsets(request, new_object)
|
||||
if all_valid(formsets) and form_validated:
|
||||
self.save_model(request, new_object, form, True)
|
||||
self.save_related(request, form, formsets, True)
|
||||
change_message = self.construct_change_message(request, form, formsets)
|
||||
self.log_change(request, new_object, change_message)
|
||||
return self.response_change(request, new_object)
|
||||
|
||||
else:
|
||||
form = ModelForm(instance=obj)
|
||||
formsets, inline_instances = self._create_formsets(request, obj)
|
||||
|
||||
adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj),
|
||||
adminForm = helpers.AdminForm(
|
||||
form,
|
||||
list(self.get_fieldsets(request, obj)),
|
||||
self.get_prepopulated_fields(request, obj),
|
||||
self.get_readonly_fields(request, obj),
|
||||
model_admin=self)
|
||||
media = self.media + adminForm.media
|
||||
|
||||
inline_admin_formsets = []
|
||||
for inline, formset in zip(inline_instances, formsets):
|
||||
fieldsets = list(inline.get_fieldsets(request, obj))
|
||||
readonly = list(inline.get_readonly_fields(request, obj))
|
||||
prepopulated = dict(inline.get_prepopulated_fields(request, obj))
|
||||
inline_admin_formset = helpers.InlineAdminFormSet(inline, formset,
|
||||
fieldsets, prepopulated, readonly, model_admin=self)
|
||||
inline_admin_formsets.append(inline_admin_formset)
|
||||
media = media + inline_admin_formset.media
|
||||
inline_formsets = self.get_inline_formsets(request, formsets, inline_instances, obj)
|
||||
for inline_formset in inline_formsets:
|
||||
media = media + inline_formset.media
|
||||
|
||||
context = dict(self.admin_site.each_context(),
|
||||
title=_('Change %s') % force_text(opts.verbose_name),
|
||||
title=(_('Add %s') if add else _('Change %s')) % force_text(opts.verbose_name),
|
||||
adminform=adminForm,
|
||||
object_id=object_id,
|
||||
original=obj,
|
||||
|
|
@ -1432,13 +1396,20 @@ class ModelAdmin(BaseModelAdmin):
|
|||
to_field=request.POST.get(TO_FIELD_VAR,
|
||||
request.GET.get(TO_FIELD_VAR)),
|
||||
media=media,
|
||||
inline_admin_formsets=inline_admin_formsets,
|
||||
inline_admin_formsets=inline_formsets,
|
||||
errors=helpers.AdminErrorList(form, formsets),
|
||||
app_label=opts.app_label,
|
||||
preserved_filters=self.get_preserved_filters(request),
|
||||
)
|
||||
|
||||
context.update(extra_context or {})
|
||||
return self.render_change_form(request, context, change=True, obj=obj, form_url=form_url)
|
||||
|
||||
return self.render_change_form(request, context, add=add, change=not add, obj=obj, form_url=form_url)
|
||||
|
||||
def add_view(self, request, form_url='', extra_context=None):
|
||||
return self.changeform_view(request, None, form_url, extra_context)
|
||||
|
||||
def change_view(self, request, object_id, form_url='', extra_context=None):
|
||||
return self.changeform_view(request, object_id, form_url, extra_context)
|
||||
|
||||
@csrf_protect_m
|
||||
def changelist_view(self, request, extra_context=None):
|
||||
|
|
|
|||
Loading…
Reference in New Issue