fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compile pybabel
[wolnelektury.git]
/
apps
/
catalogue
/
views.py
diff --git
a/apps/catalogue/views.py
b/apps/catalogue/views.py
index
9044a80
..
7ead471
100644
(file)
--- a/
apps/catalogue/views.py
+++ b/
apps/catalogue/views.py
@@
-15,7
+15,8
@@
from django.contrib.auth.decorators import login_required, user_passes_test
from django.utils.datastructures import SortedDict
from django.utils.http import urlquote_plus
from django.utils import translation
from django.utils.datastructures import SortedDict
from django.utils.http import urlquote_plus
from django.utils import translation
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _, ugettext_lazy
+from django.views.decorators.cache import never_cache
from ajaxable.utils import JSONResponse, AjaxableFormView
from ajaxable.utils import JSONResponse, AjaxableFormView
@@
-95,6
+96,7
@@
def differentiate_tags(request, tags, ambiguous_slugs):
context_instance=RequestContext(request))
context_instance=RequestContext(request))
+@never_cache
def tagged_object_list(request, tags=''):
try:
tags = models.Tag.get_tag_list(tags)
def tagged_object_list(request, tags=''):
try:
tags = models.Tag.get_tag_list(tags)
@@
-186,6
+188,7
@@
def tagged_object_list(request, tags=''):
'only_my_shelf': only_my_shelf,
'formats_form': forms.DownloadFormatsForm(),
'tags': tags,
'only_my_shelf': only_my_shelf,
'formats_form': forms.DownloadFormatsForm(),
'tags': tags,
+ 'theme_is_set': theme_is_set,
},
context_instance=RequestContext(request))
},
context_instance=RequestContext(request))
@@
-201,6
+204,7
@@
def book_fragments(request, slug, theme_slug):
context_instance=RequestContext(request))
context_instance=RequestContext(request))
+@never_cache
def book_detail(request, slug):
try:
book = models.Book.objects.get(slug=slug)
def book_detail(request, slug):
try:
book = models.Book.objects.get(slug=slug)
@@
-242,10
+246,11
@@
def player(request, slug):
else:
have_oggs = False
audiobooks.append(media)
else:
have_oggs = False
audiobooks.append(media)
- print audiobooks
projects = sorted(projects)
projects = sorted(projects)
+ extra_info = book.get_extra_info_value()
+
return render_to_response('catalogue/player.html', locals(),
context_instance=RequestContext(request))
return render_to_response('catalogue/player.html', locals(),
context_instance=RequestContext(request))
@@
-547,17
+552,22
@@
def download_custom_pdf(request, slug, method='GET'):
class CustomPDFFormView(AjaxableFormView):
form_class = forms.CustomPDFForm
class CustomPDFFormView(AjaxableFormView):
form_class = forms.CustomPDFForm
- title =
_
('Download custom PDF')
- submit =
_
('Download')
+ title =
ugettext_lazy
('Download custom PDF')
+ submit =
ugettext_lazy
('Download')
def __call__(self, request):
from copy import copy
if request.method == 'POST':
request.GET = copy(request.GET)
def __call__(self, request):
from copy import copy
if request.method == 'POST':
request.GET = copy(request.GET)
- request.GET['next'] = "%s?%s" % (reverse('catalogue.views.download_custom_pdf', args=[request.GET
['slug']
]),
+ request.GET['next'] = "%s?%s" % (reverse('catalogue.views.download_custom_pdf', args=[request.GET
.get('slug')
]),
request.POST.urlencode())
return super(CustomPDFFormView, self).__call__(request)
request.POST.urlencode())
return super(CustomPDFFormView, self).__call__(request)
+ def get_object(self, request):
+ return get_object_or_404(models.Book, slug=request.GET.get('slug'))
+
+ def context_description(self, request, obj):
+ return obj.pretty_title()
def success(self, *args):
pass
def success(self, *args):
pass