better login/register page (new default login)

[wolnelektury.git] / src / reporting / views.py

diff --git a/src/reporting/views.py b/src/reporting/views.py
index 8cb2715..963440c 100644 (file)
--- a/src/reporting/views.py
+++ b/src/reporting/views.py
@@ -16,40 +16,45 @@ from reporting.utils import render_to_pdf, render_to_csv, generated_file_view
 
 @staff_member_required
 def stats_page(request):
 
 @staff_member_required
 def stats_page(request):

-    media = BookMedia.objects.count()
-    media_types = BookMedia.objects.values('type').\
-            annotate(count=Count('type')).\
-            order_by('type')
+    media_types = BookMedia.objects.values('type').annotate(count=Count('type')).order_by('type')

     for mt in media_types:
         mt['size'] = sum(b.file.size for b in BookMedia.objects.filter(type=mt['type']).iterator())
         if mt['type'] in ('mp3', 'ogg'):
     for mt in media_types:
         mt['size'] = sum(b.file.size for b in BookMedia.objects.filter(type=mt['type']).iterator())
         if mt['type'] in ('mp3', 'ogg'):

-            deprecated = BookMedia.objects.filter(
-                    type=mt['type'], source_sha1=None)
+            deprecated = BookMedia.objects.filter(type=mt['type'], source_sha1=None)

             mt['deprecated'] = deprecated.count()
             mt['deprecated_files'] = deprecated.order_by('book', 'name')
         else:
             mt['deprecated'] = '-'
 
             mt['deprecated'] = deprecated.count()
             mt['deprecated_files'] = deprecated.order_by('book', 'name')
         else:
             mt['deprecated'] = '-'
 

-    licenses = set(((b.extra_info.get('license'), b.extra_info.get('license_description'))
-        for b in Book.objects.all().iterator() if b.extra_info.get('license')))
+    licenses = set(
+        (b.extra_info.get('license'), b.extra_info.get('license_description'))
+        for b in Book.objects.all().iterator() if b.extra_info.get('license'))

 
 

-    return render_to_response('reporting/main.html',
-                locals(), context_instance=RequestContext(request))
+    return render_to_response('reporting/main.html', {
+        'media_types': media_types,
+        'licenses': licenses,
+    }, context_instance=RequestContext(request))

 
 
 @generated_file_view('reports/katalog.pdf', 'application/pdf',
 
 
 @generated_file_view('reports/katalog.pdf', 'application/pdf',

-        send_name=lambda: 'wolnelektury_%s.pdf' % date.today(),
-        signals=[Book.published])
+                     send_name=lambda: 'wolnelektury_%s.pdf' % date.today(), signals=[Book.published])

 def catalogue_pdf(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
 def catalogue_pdf(path):
     books_by_author, orphans, books_by_parent = Book.book_list()

-    render_to_pdf(path, 'reporting/catalogue.texml', locals(), {
-            "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
-        })
+    render_to_pdf(path, 'reporting/catalogue.texml', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    }, {
+        "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
+    })

 
 
 @generated_file_view('reports/katalog.csv', 'application/csv',
 
 
 @generated_file_view('reports/katalog.csv', 'application/csv',

-        send_name=lambda: 'wolnelektury_%s.csv' % date.today(),
-        signals=[Book.published])
+                     send_name=lambda: 'wolnelektury_%s.csv' % date.today(), signals=[Book.published])

 def catalogue_csv(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
 def catalogue_csv(path):
     books_by_author, orphans, books_by_parent = Book.book_list()

-    render_to_csv(path, 'reporting/catalogue.csv', locals())
+    render_to_csv(path, 'reporting/catalogue.csv', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    })