fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move a bunch of things to celery
[wolnelektury.git]
/
apps
/
catalogue
/
views.py
diff --git
a/apps/catalogue/views.py
b/apps/catalogue/views.py
index
c8549c2
..
eadaeca
100644
(file)
--- a/
apps/catalogue/views.py
+++ b/
apps/catalogue/views.py
@@
-22,14
+22,13
@@
from ajaxable.utils import JSONResponse, AjaxableFormView
from catalogue import models
from catalogue import forms
from catalogue import models
from catalogue import forms
-from catalogue.utils import
(split_tags, AttachmentHttpResponse,
- async_build_pdf, MultiQuerySet)
+from catalogue.utils import
split_tags, MultiQuerySet, get_customized_pdf_path
+from catalogue.tasks import build_custom_pdf
from pdcounter import models as pdcounter_models
from pdcounter import views as pdcounter_views
from suggest.forms import PublishingSuggestForm
from picture.models import Picture
from pdcounter import models as pdcounter_models
from pdcounter import views as pdcounter_views
from suggest.forms import PublishingSuggestForm
from picture.models import Picture
-from os import path
from waiter.models import WaitedFile
staff_required = user_passes_test(lambda user: user.is_staff)
from waiter.models import WaitedFile
staff_required = user_passes_test(lambda user: user.is_staff)
@@
-539,11
+538,11
@@
def download_custom_pdf(request, slug, method='GET'):
form = forms.CustomPDFForm(method == 'GET' and request.GET or request.POST)
if form.is_valid():
cust = form.customizations
form = forms.CustomPDFForm(method == 'GET' and request.GET or request.POST)
if form.is_valid():
cust = form.customizations
- pdf_file =
models.
get_customized_pdf_path(book, cust)
+ pdf_file = get_customized_pdf_path(book, cust)
url = WaitedFile.order(pdf_file,
url = WaitedFile.order(pdf_file,
- lambda p:
async_build
_pdf.delay(book.id, cust, p),
-
"%s: %s" % (book.pretty_title(), ", ".join(cust)
)
+ lambda p:
build_custom
_pdf.delay(book.id, cust, p),
+
book.pretty_title(
)
)
return redirect(url)
else:
)
return redirect(url)
else:
@@
-556,6
+555,7
@@
class CustomPDFFormView(AjaxableFormView):
form_class = forms.CustomPDFForm
title = ugettext_lazy('Download custom PDF')
submit = ugettext_lazy('Download')
form_class = forms.CustomPDFForm
title = ugettext_lazy('Download custom PDF')
submit = ugettext_lazy('Download')
+ honeypot = True
def __call__(self, request):
from copy import copy
def __call__(self, request):
from copy import copy