fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cite base
[wolnelektury.git]
/
src
/
lesmianator
/
views.py
diff --git
a/src/lesmianator/views.py
b/src/lesmianator/views.py
index
35aa078
..
f814bbc
100644
(file)
--- a/
src/lesmianator/views.py
+++ b/
src/lesmianator/views.py
@@
-2,8
+2,7
@@
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext
+from django.shortcuts import render, get_object_or_404
from django.views.decorators import cache
from catalogue.utils import get_random_hash
from django.views.decorators import cache
from catalogue.utils import get_random_hash
@@
-15,11
+14,10
@@
def main_page(request):
last = Poem.objects.all().order_by('-created_at')[:10]
shelves = Tag.objects.filter(user__username='lesmianator')
last = Poem.objects.all().order_by('-created_at')[:10]
shelves = Tag.objects.filter(user__username='lesmianator')
- return render_to_response(
+ return render(
+ request,
'lesmianator/lesmianator.html',
'lesmianator/lesmianator.html',
- {"last": last, "shelves": shelves},
- context_instance=RequestContext(request))
-
+ {"last": last, "shelves": shelves})
@cache.never_cache
def new_poem(request):
@cache.never_cache
def new_poem(request):
@@
-28,10
+26,10
@@
def new_poem(request):
p = Poem(slug=get_random_hash(text), text=text, created_by=user)
p.save()
p = Poem(slug=get_random_hash(text), text=text, created_by=user)
p.save()
- return render_to_response(
+ return render(
+ request,
'lesmianator/poem.html',
'lesmianator/poem.html',
- {"poem": p},
- context_instance=RequestContext(request))
+ {"poem": p})
@cache.never_cache
@cache.never_cache
@@
-43,10
+41,10
@@
def poem_from_book(request, slug):
p.created_from = [book.id]
p.save()
p.created_from = [book.id]
p.save()
- return render_to_response(
+ return render(
+ request,
'lesmianator/poem.html',
'lesmianator/poem.html',
- {"poem": p, "books": [book], "book": book},
- context_instance=RequestContext(request))
+ {"poem": p, "books": [book], "book": book})
@cache.never_cache
@cache.never_cache
@@
-61,10
+59,10
@@
def poem_from_set(request, shelf):
book = books[0] if len(books) == 1 else None
book = books[0] if len(books) == 1 else None
- return render_to_response(
+ return render(
+ request,
'lesmianator/poem.html',
'lesmianator/poem.html',
- {"poem": p, "shelf": tag, "books": books, "book": book},
- context_instance=RequestContext(request))
+ {"poem": p, "shelf": tag, "books": books, "book": book})
def get_poem(request, poem):
def get_poem(request, poem):
@@
-76,7
+74,7
@@
def get_poem(request, poem):
else:
books = book = None
else:
books = book = None
- return render_to_response(
+ return render(
+ request,
'lesmianator/poem.html',
'lesmianator/poem.html',
- {"poem": p, "books": books, "book": book},
- context_instance=RequestContext(request))
+ {"poem": p, "books": books, "book": book})