0001-manager-switch-page-reordering-request-to-POST-65617.patch

Frédéric Péters, 24 mai 2022 08:38

Voir les différences: en ligne côte à côte

Subject: [PATCH] manager: switch page reordering request to POST (#65617)

 combo/manager/static/js/combo.manager.js |  1 +
 combo/manager/views.py                   | 26 ++++++++++++++++--------
 tests/test_manager.py                    | 23 ++++++++++++---------
 3 files changed, 32 insertions(+), 18 deletions(-)

combo/manager/static/js/combo.manager.js
177	177
178	178	$.ajax({
179	179	url: $('#pages-list').data('page-order-url'),
	180	type: 'POST',
180	181	data: {'new-order': new_order,
181	182	'moved-page-id': moved_page_id,
182	183	'moved-page-new-parent': new_parent

     from django.contrib import messages
     from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
     from django.db import transaction
     from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
     from django.http import (
         Http404,
         HttpResponse,
         HttpResponseBadRequest,
         HttpResponseNotAllowed,
         HttpResponseRedirect,
         JsonResponse,
+    )
     from django.shortcuts import get_object_or_404, redirect, render
     from django.template import engines
     from django.urls import reverse, reverse_lazy
-...
     from django.utils.formats import date_format
     from django.utils.timezone import localtime
     from django.utils.translation import ugettext_lazy as _
     from django.views.decorators.csrf import requires_csrf_token
     from django.views.decorators.csrf import csrf_exempt, requires_csrf_token
     from django.views.generic import (
         CreateView,
         DeleteView,
-...
     cell_order = PageCellOrder.as_view()
     @csrf_exempt
     @staff_required
     def page_order(request):
         if request.method != 'POST':
             return HttpResponseNotAllowed(['post'])
         params = ['new-order', 'moved-page-id', 'moved-page-new-parent']
         for param in params:
             if param not in request.GET:
             if param not in request.POST:
                 return HttpResponseBadRequest('missing %s parameter' % param)
         new_order = [int(x) for x in request.GET['new-order'].split(',')]
         moved_page = Page.objects.get(id=request.GET['moved-page-id'])
         if request.GET['moved-page-new-parent']:
         new_order = [int(x) for x in request.POST['new-order'].split(',')]
         moved_page = Page.objects.get(id=request.POST['moved-page-id'])
         if request.POST['moved-page-new-parent']:
             # recreate full hierarchy to avoid cycles
             current_hierarchy = Page.objects.get(id=request.GET['moved-page-new-parent']).get_parents_and_self()
             current_hierarchy = Page.objects.get(id=request.POST['moved-page-new-parent']).get_parents_and_self()
             new_hierarchy = [x for x in current_hierarchy if not x.id == moved_page.id] + [moved_page]
             for i, page in enumerate(new_hierarchy):
                 old_parent_id = page.parent_id
-...
         if slug_conflict:
             # slug conflict after a page got moved, reload and rename
             moved_page = Page.objects.get(id=request.GET['moved-page-id'])
             moved_page = Page.objects.get(id=request.POST['moved-page-id'])
             moved_page.slug = moved_page.slug + '-' + hashlib.md5(force_bytes(moved_page.id)).hexdigest()[:4]
             moved_page.save()
         return redirect(reverse('combo-manager-homepage'))

         ordered_ids = [x.id for x in Page.get_as_reordered_flat_hierarchy(Page.objects.all())]
         assert ordered_ids == [page1.id, page2.id, page3.id, page4.id]
         # missing get params
         app.get(
         # invalid method
         app.get('/manage/pages/order', status=405)
         # missing params
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-new-parent': 42,
-...
             },
             status=400,
+        )
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': 42,
-...
             },
             status=400,
+        )
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': 42,
-...
+        )
         # missing page3 in order
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page4.id,
-...
         assert ordered_ids == [page1.id, page2.id, page3.id, page4.id]
         # move page4 before page3
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page4.id,
-...
         assert ordered_ids == [page1.id, page2.id, page4.id, page3.id]
         # move page4 to level0
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page4.id,
-...
         page4.slug = 'three'
         page4.save()
         # move it as a sibling of page3
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page4.id,
-...
         page2.save()
         page3.parent = page2
         page3.save()
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page1.id,
-...
         page3.save()
         page4.parent = page3
         page4.save()
         app.get(
         app.post(
             '/manage/pages/order',
             params={
                 'moved-page-id': page2.id,
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-manager-switch-page-reordering-request-to-POST-65617.patch