Merge branch 'main' into 2571
This commit is contained in:
commit
74f08323d1
20 changed files with 95 additions and 76 deletions
|
@ -115,7 +115,7 @@ def sometimes_async_activity_task(activity_json, queue=MEDIUM):
|
|||
activity_task.apply_async(args=(activity_json,), queue=queue)
|
||||
|
||||
|
||||
@app.task(queue=MEDIUM, ignore_result=True)
|
||||
@app.task(queue=MEDIUM)
|
||||
def activity_task(activity_json):
|
||||
"""do something with this json we think is legit"""
|
||||
# lets see if the activitypub module can make sense of this json
|
||||
|
|
|
@ -8,7 +8,7 @@ from django.db import transaction
|
|||
from django.db.models import Avg, DecimalField, Q, Max
|
||||
from django.db.models.functions import Coalesce
|
||||
from django.http import HttpResponseBadRequest, HttpResponse
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
from django.template.response import TemplateResponse
|
||||
from django.urls import reverse
|
||||
from django.utils.decorators import method_decorator
|
||||
|
@ -183,7 +183,7 @@ def delete_list(request, list_id):
|
|||
book_list.raise_not_deletable(request.user)
|
||||
|
||||
book_list.delete()
|
||||
return redirect_to_referer(request, "lists")
|
||||
return redirect("/list")
|
||||
|
||||
|
||||
@require_POST
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue