mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Avoid assuming an integer PK named 'id' on multiple upload views

Browse Source 
Fixes #6512
This commit is contained in:
Matt Westcott 2022-08-12 12:07:15 +01:00 committed by LB (Ben Johnston)
parent 9e810ce5b0
commit ab610df620
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.txt
View File

@ -22,6 +22,7 @@ Changelog
* Refine designs for disabled buttons throughout the admin interface (Paarth Agarwal)
* Update expanding formset add buttons to use `button` not link for behaviour (LB (Ben) Johnston)
* Add robust unit testing for authentication scenarios across the user management admin pages (Mehrdad Moradizadeh)
* Avoid assuming an integer PK named 'id' on multiple upload views (Matt Westcott)
* Fix: Prevent `PageQuerySet.not_public` from returning all pages when no page restrictions exist (Mehrdad Moradizadeh)
* Fix: Ensure that duplicate block ids are unique when duplicating stream blocks in the page editor (Joshua Munn)
* Fix: Revise colour usage so that privacy & locked indicators can be seen in Windows High Contrast mode (LB (Ben Johnston))

1
docs/releases/4.1.md
View File

@ -31,6 +31,7 @@ Wagtail 4.1 is designated a Long Term Support (LTS) release. Long Term Support r
* Refine designs for disabled buttons throughout the admin interface (Paarth Agarwal)
* Update expanding formset add buttons to use `button` not link for behaviour and remove support for disabled as a class (LB (Ben) Johnston)
* Add robust unit testing for authentication scenarios across the user management admin pages (Mehrdad Moradizadeh)
* Avoid assuming an integer PK named 'id' on multiple upload views (Matt Westcott)
### Bug fixes

21
wagtail/admin/views/generic/multiple_upload.py
View File

@ -54,13 +54,13 @@ class AddView(PermissionCheckedMixin, TemplateView):
edit_form_class = self.get_edit_form_class()
return {
self.context_object_name: self.object,
"edit_action": reverse(self.edit_object_url_name, args=(self.object.id,)),
"edit_action": reverse(self.edit_object_url_name, args=(self.object.pk,)),
"delete_action": reverse(
self.delete_object_url_name, args=(self.object.id,)
self.delete_object_url_name, args=(self.object.pk,)
),
"form": edit_form_class(
instance=self.object,
prefix="%s-%d" % (self.edit_object_form_prefix, self.object.id),
prefix="%s-%d" % (self.edit_object_form_prefix, self.object.pk),
user=self.request.user,
),
}
@ -71,7 +71,7 @@ class AddView(PermissionCheckedMixin, TemplateView):
"""
return {
"success": True,
self.context_object_id_name: int(self.object.id),
self.context_object_id_name: self.object.pk,
"form": render_to_string(
self.edit_form_template_name,
self.get_edit_object_form_context_data(),
@ -213,7 +213,7 @@ class EditView(View):
self.model = self.get_model()
self.form_class = self.get_edit_form_class()
self.object = get_object_or_404(self.model, id=object_id)
self.object = get_object_or_404(self.model, pk=object_id)
if not self.permission_policy.user_has_permission_for_instance(
request.user, "change", self.object
@ -234,14 +234,14 @@ class EditView(View):
return JsonResponse(
{
"success": True,
self.context_object_id_name: int(object_id),
self.context_object_id_name: self.object.pk,
}
)
else:
return JsonResponse(
{
"success": False,
self.context_object_id_name: int(object_id),
self.context_object_id_name: self.object.pk,
"form": render_to_string(
self.edit_form_template_name,
{
@ -271,7 +271,10 @@ class DeleteView(View):
def post(self, request, *args, **kwargs):
object_id = kwargs[self.pk_url_kwarg]
self.model = self.get_model()
self.object = get_object_or_404(self.model, id=object_id)
self.object = get_object_or_404(self.model, pk=object_id)
object_id = (
self.object.pk
) # retrieve object id cast to the appropriate type (usually int)
if not self.permission_policy.user_has_permission_for_instance(
request.user, "delete", self.object
@ -283,7 +286,7 @@ class DeleteView(View):
return JsonResponse(
{
"success": True,
self.context_object_id_name: int(object_id),
self.context_object_id_name: object_id,
}
)