update requirements

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 86dc74d..6496742 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -8,6 +8,7 @@ import os
 import shutil
 import subprocess
 from tempfile import NamedTemporaryFile
 import shutil
 import subprocess
 from tempfile import NamedTemporaryFile

+from xml.sax.saxutils import escape as escape_xml

 
 from django.conf import settings
 from django.contrib import auth
 
 from django.conf import settings
 from django.contrib import auth


@@ -24,6 +25,7 @@ from django.views.decorators.http import require_POST
 from unidecode import unidecode
 
 from catalogue import forms
 from unidecode import unidecode
 
 from catalogue import forms

+from catalogue.filters import DocumentFilterSet

 from catalogue.forms import TagMultipleForm, TagSingleForm
 from catalogue.helpers import active_tab
 from catalogue.models import Category
 from catalogue.forms import TagMultipleForm, TagSingleForm
 from catalogue.helpers import active_tab
 from catalogue.models import Category


@@ -114,17 +116,24 @@ def create_missing(request):
             else:
                 cover_url = ''
 
             else:
                 cover_url = ''
 

-            doc.commit(
-                text='''<section xmlns="http://nowoczesnapolska.org.pl/sst#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+            text = '''<section xmlns="http://nowoczesnapolska.org.pl/sst#" xmlns:dc="http://purl.org/dc/elements/1.1/">

                 <metadata>
                 <metadata>

-                    <dc:publisher>''' + form.cleaned_data['publisher'] + '''</dc:publisher>
-                    <dc:description>''' + form.cleaned_data['description'] + '''</dc:description>
-                    ''' + '\n'.join(tag_form.metadata_rows() for tag_form in tag_forms) + '''
-                    <dc:relation.coverImage.url>''' + cover_url + '''</dc:relation.coverImage.url>
+                    <dc:publisher>%s</dc:publisher>
+                    <dc:description>%s</dc:description>
+                    %s
+                    <dc:relation.coverImage.url>%s</dc:relation.coverImage.url>

                 </metadata>
                 </metadata>

-                <header>''' + title + '''</header>
+                <header>%s</header>

                 <div class="p"> </div>
                 <div class="p"> </div>

-                </section>''',
+                </section>''' % (
+                    escape_xml(form.cleaned_data['publisher']),
+                    escape_xml(form.cleaned_data['description']),
+                    '\n'.join(tag_form.metadata_rows() for tag_form in tag_forms),
+                    escape_xml(cover_url),
+                    escape_xml(title))
+
+            doc.commit(
+                text=text,

                 author=creator
             )
             doc.assigned_to = request.user
                 author=creator
             )
             doc.assigned_to = request.user


@@ -510,12 +519,16 @@ def fork(request, pk):
 
 
 def upcoming(request):
 
 
 def upcoming(request):

+    f = DocumentFilterSet(request.GET, queryset=Document.objects.filter(deleted=False).filter(publish_log=None))

     return render(request, "catalogue/upcoming.html", {
     return render(request, "catalogue/upcoming.html", {

-        'objects_list': Document.objects.filter(deleted=False).filter(publish_log=None),
+        'filter_set': f,
+        'link_url': 'catalogue_preview',

     })
 
 
 def finished(request):
     })
 
 
 def finished(request):

+    f = DocumentFilterSet(request.GET, queryset=Document.objects.filter(deleted=False).exclude(publish_log=None))

     return render(request, "catalogue/finished.html", {
     return render(request, "catalogue/finished.html", {

-        'objects_list': Document.objects.filter(deleted=False).exclude(publish_log=None),
+        'filter_set': f,
+        'link_url': 'catalogue_html',

     })
     })