update requirements

[redakcja.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 22aeffe..fc572c2 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -15,15 +15,18 @@ from django.db.models import Count, Q
 from django.db import transaction
 from django import http
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.db import transaction
 from django import http
 from django.http import Http404, HttpResponse, HttpResponseForbidden

+from django.http.response import HttpResponseRedirect

 from django.shortcuts import get_object_or_404, render
 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.shortcuts import get_object_or_404, render
 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_cas.decorators import user_passes_test

 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers
 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers

+from catalogue.forms import MarkFinalForm

 from catalogue.helpers import active_tab
 from catalogue.models import (Book, Chunk, Image, BookPublishRecord, 
         ChunkPublishRecord, ImagePublishRecord, Project)
 from catalogue.helpers import active_tab
 from catalogue.models import (Book, Chunk, Image, BookPublishRecord, 
         ChunkPublishRecord, ImagePublishRecord, Project)


@@ -204,18 +207,27 @@ def upload(request):
     })
 
 
     })
 
 

-@never_cache
-def book_xml(request, slug):
-    book = get_object_or_404(Book, slug=slug)
+def serve_xml(request, book, slug):

     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")

-    xml = book.materialize()
-
+    xml = book.materialize(publishable=True)

     response = http.HttpResponse(xml, content_type='application/xml')
     response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
     return response
 
 
     response = http.HttpResponse(xml, content_type='application/xml')
     response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
     return response
 
 

+@never_cache
+def book_xml(request, slug):
+    book = get_object_or_404(Book, slug=slug)
+    return serve_xml(request, book, slug)
+
+
+@never_cache
+def book_xml_dc(request, slug):
+    book = get_object_or_404(Book, dc_slug=slug)
+    return serve_xml(request, book, slug)
+
+

 @never_cache
 def book_txt(request, slug):
     book = get_object_or_404(Book, slug=slug)
 @never_cache
 def book_txt(request, slug):
     book = get_object_or_404(Book, slug=slug)


@@ -562,7 +574,7 @@ def publish(request, slug):
     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))
     except BaseException, e:
     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))
     except BaseException, e:

-        return http.HttpResponse(e)
+        return http.HttpResponse(repr(e))

     else:
         return http.HttpResponseRedirect(book.get_absolute_url())
 
     else:
         return http.HttpResponseRedirect(book.get_absolute_url())
 


@@ -587,8 +599,6 @@ def publish_image(request, slug):
 class GalleryView(UploadView):
     def get_object(self, request, slug):
         book = get_object_or_404(Book, slug=slug)
 class GalleryView(UploadView):
     def get_object(self, request, slug):
         book = get_object_or_404(Book, slug=slug)

-        if not book.public and not request.user.has_perm('catalogue.change_book'):
-            return HttpResponseForbidden()

         if not book.gallery:
             raise Http404
         return book
         if not book.gallery:
             raise Http404
         return book


@@ -635,3 +645,17 @@ def active_users_list(request):
     })
 
 
     })
 
 

+@user_passes_test(lambda u: u.is_superuser)
+def mark_final(request):
+    if request.method == 'POST':
+        form = MarkFinalForm(data=request.POST)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(reverse('mark_final_completed'))
+    else:
+        form = MarkFinalForm()
+    return render(request, 'catalogue/mark_final.html', {'form': form})
+
+
+def mark_final_completed(request):
+    return render(request, 'catalogue/mark_final_completed.html')