X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/72afcd696d097e09c792c395b8e2149820fefe2c..0946041483bdb729ae076d8ead0699524eeeb4b2:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 1436fc02..9bd69f8b 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -25,8 +25,8 @@ 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 fileupload.views import UploadView +from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord, Project +from fileupload.views import UploadView, PackageView # # Quick hack around caching problems, TODO: use ETags @@ -352,6 +352,7 @@ def chunk_add(request, slug, chunk): }) +@login_required def chunk_edit(request, slug, chunk): try: doc = Chunk.get(slug, chunk) @@ -389,6 +390,7 @@ def chunk_edit(request, slug, chunk): @transaction.commit_on_success +@login_required def chunk_mass_edit(request): if request.method == 'POST': ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(','))) @@ -429,6 +431,17 @@ def chunk_mass_edit(request): 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") @@ -475,13 +488,17 @@ def publish(request, slug): return http.HttpResponseRedirect(book.get_absolute_url()) -class GalleryView(UploadView): +class GalleryMixin(object): + def get_directory(self): + return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery) def get_object(self, request, slug): book = get_object_or_404(Book, slug=slug) if not book.gallery: raise Http404 return book +class GalleryView(GalleryMixin, UploadView): + def breadcrumbs(self): return [ (_('books'), reverse('catalogue_document_list')), @@ -489,5 +506,8 @@ class GalleryView(UploadView): (_('scan gallery'),), ] - def get_directory(self): - return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery) + +class GalleryPackageView(GalleryMixin, PackageView): + + def get_redirect_url(self, slug): + return reverse('catalogue_book_gallery', kwargs = dict(slug=slug))