X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d7faec10cb85ad286673eec266ccc397142bc20c..c2de733944de9c66c25f61fafa9e295d2c29f32c:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index f8ff5996..ebc35751 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -5,6 +5,7 @@ from StringIO import StringIO from urllib import unquote from urlparse import urlsplit, urlunsplit +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, permission_required @@ -18,15 +19,14 @@ from django.utils.encoding import iri_to_uri from django.utils.http import urlquote_plus from django.utils.translation import ugettext_lazy as _ from django.views.decorators.http import require_POST -from django.views.generic.simple import direct_to_template from django.template import RequestContext from apiclient import NotAuthorizedError from catalogue import forms from catalogue import helpers from catalogue.helpers import active_tab -from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord -from catalogue.tasks import publishable_error +from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord, Project +from fileupload.views import UploadView # # Quick hack around caching problems, TODO: use ETags @@ -62,7 +62,7 @@ def my(request): @active_tab('users') def users(request): - return direct_to_template(request, 'catalogue/user_list.html', extra_context={ + return render(request, 'catalogue/user_list.html', { 'users': User.objects.all().annotate(count=Count('chunk')).order_by( '-count', 'last_name', 'first_name'), }) @@ -122,7 +122,7 @@ def create_missing(request, slug=None): "gallery": slug, }) - return direct_to_template(request, "catalogue/document_create_missing.html", extra_context={ + return render(request, "catalogue/document_create_missing.html", { "slug": slug, "form": form, @@ -177,7 +177,7 @@ def upload(request): title=title, ) - return direct_to_template(request, "catalogue/document_upload.html", extra_context={ + return render(request, "catalogue/document_upload.html", { "form": form, "ok_list": ok_list, "skipped_list": skipped_list, @@ -188,7 +188,7 @@ def upload(request): else: form = forms.DocumentsUploadForm() - return direct_to_template(request, "catalogue/document_upload.html", extra_context={ + return render(request, "catalogue/document_upload.html", { "form": form, "logout_to": '/', @@ -303,10 +303,10 @@ def book(request, slug): form = forms.ReadonlyBookForm(instance=book) editable = False - publish_error = publishable_error(book) + publish_error = book.publishable_error() publishable = publish_error is None - return direct_to_template(request, "catalogue/book_detail.html", extra_context={ + return render(request, "catalogue/book_detail.html", { "book": book, "publishable": publishable, "publishable_error": publish_error, @@ -346,12 +346,13 @@ def chunk_add(request, slug, chunk): "title": "cz. %d" % (doc.number + 1, ), }) - return direct_to_template(request, "catalogue/chunk_add.html", extra_context={ + return render(request, "catalogue/chunk_add.html", { "chunk": doc, "form": form, }) +@login_required def chunk_edit(request, slug, chunk): try: doc = Chunk.get(slug, chunk) @@ -381,7 +382,7 @@ def chunk_edit(request, slug, chunk): else: go_next = '' - return direct_to_template(request, "catalogue/chunk_edit.html", extra_context={ + return render(request, "catalogue/chunk_edit.html", { "chunk": doc, "form": form, "go_next": go_next, @@ -389,21 +390,61 @@ def chunk_edit(request, slug, chunk): @transaction.commit_on_success +@login_required def chunk_mass_edit(request): if request.method == 'POST': - ids = map(int, request.POST.get('ids').split(',')) + ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(','))) chunks = map(lambda i: Chunk.objects.get(id=i), ids) - try: - stage = Chunk.tag_model.objects.get(slug=request.POST.get('stage')) + + stage = request.POST.get('stage') + if stage: + try: + stage = Chunk.tag_model.objects.get(slug=stage) + except Chunk.DoesNotExist, e: + stage = None + for c in chunks: c.stage = stage - except KeyError: pass - try: - user = User.objects.get(username=request.POST.get('user')) + username = request.POST.get('user') + logger.info("username: %s" % username) + logger.info(request.POST) + if username: + try: + user = User.objects.get(username=username) + except User.DoesNotExist, e: + user = None + for c in chunks: c.user = user - except KeyError: pass + + status = request.POST.get('status') + if status: + books_affected = set() + for c in chunks: + if status == 'publish': + c.head.publishable = True + c.head.save() + elif status == 'unpublish': + c.head.publishable = False + c.head.save() + c.touch() # cache + books_affected.add(c.book) + for b in books_affected: + b.touch() # cache + + project_id = request.POST.get('project') + if project_id: + try: + project = Project.objects.get(pk=int(project_id)) + except (Project.DoesNotExist, ValueError), e: + project = None + for c in chunks: + book = c.book + book.project = project + book.save() for c in chunks: c.save() + + return HttpResponse("", content_type="text/plain") else: raise Http404 @@ -422,7 +463,7 @@ def book_append(request, slug): return http.HttpResponseRedirect(append_to.get_absolute_url()) else: form = forms.BookAppendForm(book) - return direct_to_template(request, "catalogue/book_append_to.html", extra_context={ + return render(request, "catalogue/book_append_to.html", { "book": book, "form": form, @@ -445,3 +486,21 @@ def publish(request, slug): return http.HttpResponse(e) else: return http.HttpResponseRedirect(book.get_absolute_url()) + + +class GalleryView(UploadView): + def get_object(self, request, slug): + book = get_object_or_404(Book, slug=slug) + if not book.gallery: + raise Http404 + return book + + def breadcrumbs(self): + return [ + (_('books'), reverse('catalogue_document_list')), + (self.object.title, self.object.get_absolute_url()), + (_('scan gallery'),), + ] + + def get_directory(self): + return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)