X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/194720827e4a634d5ee45001e9a091e3162a7698..b477b3cfa2ce28678eb6c861b286e86ed77046ee:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index c43a46f5..658b3d4c 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -13,9 +13,10 @@ from django.conf import settings from django.contrib import auth from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required +from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django import http -from django.http import Http404 +from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404, render, redirect from django.utils.encoding import force_str from django.utils.http import urlquote_plus @@ -24,6 +25,7 @@ from django.views.decorators.http import require_POST from catalogue import forms from catalogue.helpers import active_tab from librarian import BuildError +from redakcja.utlis import send_notify_email from .constants import STAGES from .models import Document, Plan from dvcs.models import Revision @@ -214,7 +216,10 @@ def book_pdf(request, pk, rev_pk): rev = get_object_or_404(Revision, pk=rev_pk) # Test - sst = SST.from_string(rev.materialize()) + try: + sst = SST.from_string(rev.materialize()) + except ValueError as e: + return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') ctx = Context( files_path='http://%s/media/dynamic/uploads/%s/' % (request.get_host(), pk), @@ -225,7 +230,6 @@ def book_pdf(request, pk, rev_pk): try: pdf_file = PdfFormat(sst).build(ctx) except BuildError as e: - from django.http import HttpResponse return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') from catalogue.ebook_utils import serve_file @@ -242,7 +246,10 @@ def book_epub(request, pk, rev_pk): rev = get_object_or_404(Revision, pk=rev_pk) # Test - sst = SST.from_string(rev.materialize()) + try: + sst = SST.from_string(rev.materialize()) + except ValueError as e: + return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') ctx = Context( files_path='http://%s/media/dynamic/uploads/%s/' % (request.get_host(), pk), @@ -253,7 +260,6 @@ def book_epub(request, pk, rev_pk): try: epub_file = EpubFormat(sst).build(ctx) except BuildError as e: - from django.http import HttpResponse return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') from catalogue.ebook_utils import serve_file @@ -269,7 +275,10 @@ def book_mobi(request, pk, rev_pk): doc = get_object_or_404(Document, pk=pk) rev = get_object_or_404(Revision, pk=rev_pk) - sst = SST.from_string(rev.materialize()) + try: + sst = SST.from_string(rev.materialize()) + except ValueError as e: + return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') ctx = Context( files_path='http://%s/media/dynamic/uploads/%s/' % (request.get_host(), pk), @@ -280,7 +289,6 @@ def book_mobi(request, pk, rev_pk): try: epub_file = EpubFormat(sst).build(ctx) except BuildError as e: - from django.http import HttpResponse return HttpResponse(content=force_str(e.message), content_type='text/plain', status='400') output_file = NamedTemporaryFile(prefix='librarian', suffix='.mobi', delete=False) @@ -398,7 +406,17 @@ def publish(request, pk): # FIXME: check if in tree # if PublishRecord.objects.filter(revision=rev, document=doc).exists(): # return http.HttpResponse('exists') + if not doc.published: + site = Site.objects.get_current() + send_notify_email( + 'New published document in MIL/PEER', + '''New published document in MIL/PEER: %s. View it in browser: https://%s%s. + +-- +MIL/PEER team.''' % (doc.meta()['title'], site.domain, reverse('catalogue_html', args=[doc.pk]))) PublishRecord.objects.create(revision=rev, document=doc, user=request.user) + doc.published = True + doc.save() if request.is_ajax(): return http.HttpResponse('ok') else: