X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/90e4a87f6ebffca42088cb952281c40555d2c520..98062d2158ebe1f734d811691ab15e6887684281:/src/reporting/views.py diff --git a/src/reporting/views.py b/src/reporting/views.py index bc0dee6eb..9eecf0d55 100644 --- a/src/reporting/views.py +++ b/src/reporting/views.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -7,8 +6,7 @@ from datetime import date from django.conf import settings from django.contrib.admin.views.decorators import staff_member_required from django.db.models import Count -from django.shortcuts import render_to_response -from django.template import RequestContext +from django.shortcuts import render from catalogue.models import Book, BookMedia from reporting.utils import render_to_pdf, render_to_csv, generated_file_view @@ -26,14 +24,16 @@ def stats_page(request): 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() + for b in Book.objects.all().iterator(): + extra_info = b.get_extra_info_json() + if extra_info.get('license'): + licenses.add((extra_info.get('license'), extra_info.get('license_description'))) - return render_to_response('reporting/main.html', { + return render(request, 'reporting/main.html', { 'media_types': media_types, 'licenses': licenses, - }, context_instance=RequestContext(request)) + }) @generated_file_view('reports/katalog.pdf', 'application/pdf', @@ -43,7 +43,7 @@ def catalogue_pdf(path): render_to_pdf(path, 'reporting/catalogue.texml', { 'books_by_author': books_by_author, 'orphans': orphans, - 'book_by_parent': books_by_parent, + 'books_by_parent': books_by_parent, }, { "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"), }) @@ -56,5 +56,5 @@ def catalogue_csv(path): render_to_csv(path, 'reporting/catalogue.csv', { 'books_by_author': books_by_author, 'orphans': orphans, - 'book_by_parent': books_by_parent, + 'books_by_parent': books_by_parent, })