from django.views.generic import TemplateView
from ajaxable.utils import AjaxableFormView
-from club.forms import ScheduleForm, DonationStep1Form
+from club.forms import DonationStep1Form
from club.models import Club
from annoy.models import DynamicTextInsert
from pdcounter import views as pdcounter_views
})
-def book_list(request, filters=None, template_name='catalogue/book_list.html',
- nav_template_name='catalogue/snippets/book_list_nav.html',
- list_template_name='catalogue/snippets/book_list.html'):
- """ generates a listing of all books, optionally filtered """
- books_by_author, orphans, books_by_parent = Book.book_list(filters)
- books_nav = OrderedDict()
- for tag in books_by_author:
- if books_by_author[tag]:
- books_nav.setdefault(tag.sort_key[0], []).append(tag)
- return render(request, template_name, {
- 'rendered_nav': render_to_string(nav_template_name, {'books_nav': books_nav}),
- 'rendered_book_list': render_to_string(list_template_name, {
- 'books_by_author': books_by_author,
- 'orphans': orphans,
- 'books_by_parent': books_by_parent,
- })
- })
-
-
def daisy_list(request):
- if request.EXPERIMENTS['layout'].value:
- return object_list(request, Book.objects.filter(media__type='daisy'))
- return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
+ return object_list(request, Book.objects.filter(media__type='daisy'))
def collection(request, slug):
coll = get_object_or_404(Collection, slug=slug)
- if request.EXPERIMENTS['layout'].value:
- template_name = 'catalogue/2022/collection.html'
- else:
- template_name = 'catalogue/collection.html'
+ template_name = 'catalogue/2022/collection.html'
return render(request, template_name, {
'collection': coll,
'active_menu_item': 'collections',
def search(self, qs):
term = self.request.GET.get('search')
if term:
- meta_rels = TagRelation.objects.exclude(tag__category='set')
+ meta_rels = TagRelation.objects.filter(tag__category='author')
# TODO: search tags in currently displaying language
if self.is_themed:
- #qs = qs.annotate(
- # meta=FilteredRelation('book__tag_relations', condition=Q(tag_relations__in=meta_rels))
- #)
+ rels = meta_rels.filter(tag__name_pl__icontains=term)
qs = qs.filter(
Q(book__title__icontains=term) |
- #Q(meta__tag_relations__tag__name_pl__icontains=term) |
+ Q(tag_relations__in=rels) |
Q(text__icontains=term)
).distinct()
else:
qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True)
qs = qs.exclude(ancestor__in=qs)
if self.is_themed:
- qs = Fragment.tagged.with_all(self.ctx['fragment_tags']).filter(
- Q(book__in=qs) | Q(book__ancestor__in=qs)
- )
+ fqs = Fragment.tagged.with_all(self.ctx['fragment_tags'])
+ if self.ctx['work_tags']:
+ fqs = fqs.filter(
+ Q(book__in=qs) | Q(book__ancestor__in=qs)
+ )
+ qs = fqs
return qs
def get_suggested_tags(self, queryset):
tag_ids = [t.id for t in self.ctx['tags']]
- related_tags = list(get_top_level_related_tags(self.ctx['tags']))
- if not self.is_themed:
+ if self.is_themed:
+ related_tags = []
+ current_books = self.get_queryset().values_list('book', flat=True).distinct()
+ containing_books = Book.objects.filter(Q(id__in=current_books) | Q(children__in=current_books))
+
+ related_tags.extend(list(
+ Tag.objects.usage_for_queryset(
+ containing_books,
+ ).exclude(category='set').exclude(pk__in=tag_ids)
+ ))
+ if self.request.user.is_authenticated:
+ related_tags.extend(list(
+ Tag.objects.usage_for_queryset(
+ containing_books
+ ).filter(
+ user=self.request.user
+ ).exclude(name='').exclude(pk__in=tag_ids)
+ ))
+ else:
+ related_tags = list(get_top_level_related_tags(self.ctx['tags']))
if self.request.user.is_authenticated:
qs = Book.tagged.with_all(self.ctx['tags']).filter(findable=True)
related_tags.extend(list(
if extra:
result.update(extra)
- if request.EXPERIMENTS['layout'].value:
- has_theme = any(((theme := x).category == 'theme' for x in tags))
- if has_theme:
- result['main_tag'] = theme
- template = 'catalogue/2022/theme_detail.html'
- else:
- template = 'catalogue/2022/author_detail.html'
+ has_theme = any(((theme := x).category == 'theme' for x in tags))
+ if has_theme:
+ result['main_tag'] = theme
+ template = 'catalogue/2022/theme_detail.html'
else:
- template = 'catalogue/tagged_object_list.html'
+ template = 'catalogue/2022/author_detail.html'
return render(
request, template, result,
)
-def literature(request):
- if request.EXPERIMENTS['layout'].value:
- return LiteratureView.as_view()(request)
- books = Book.objects.filter(parent=None, findable=True)
- return object_list(request, books, related_tags=get_top_level_related_tags([]))
-
-
-def gallery(request):
- if request.EXPERIMENTS['layout'].value:
- return GalleryView.as_view()(request)
- return object_list(request, Picture.objects.all(), list_type='gallery')
-
-
-def audiobooks(request):
- if request.EXPERIMENTS['layout'].value:
- return AudiobooksView.as_view()(request)
- audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct()
- return object_list(request, audiobooks, list_type='audiobooks', extra={
- 'daisy': Book.objects.filter(findable=True, media__type='daisy').distinct(),
- })
-
-
class ResponseInstead(Exception):
def __init__(self, response):
super(ResponseInstead, self).__init__()
def tagged_object_list(request, tags, list_type):
- if request.EXPERIMENTS['layout'].value and list_type in ('books', 'audiobooks'):
+ if list_type in ('books', 'audiobooks'):
return TaggedObjectList.as_view()(request, tags=tags)
try:
fragments = Fragment.tagged.with_all([theme]).filter(
Q(book=book) | Q(book__ancestor=book))
- if request.EXPERIMENTS['layout'].value:
- template_name = 'catalogue/2022/book_fragments.html'
- else:
- template_name = 'catalogue/book_fragments.html'
-
+ template_name = 'catalogue/2022/book_fragments.html'
return render(
request,
template_name,
except Book.DoesNotExist:
return pdcounter_views.book_stub_detail(request, slug)
- new_layout = request.EXPERIMENTS['layout']
-
return render(
request,
- 'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
+ 'catalogue/2022/book_detail.html',
{
'book': book,
'accessible': book.is_accessible_to(request.user),
'book_children': book.children.all().order_by('parent_number', 'sort_key'),
'active_menu_item': 'books',
- 'club_form': ScheduleForm() if book.preview else None,
'club': Club.objects.first() if book.preview else None,
'donation_form': DonationStep1Form(),
-
- 'EXPERIMENTS_SWITCHABLE_layout': True,
- })
-
-
-# używane w publicznym interfejsie
-def player(request, slug):
- book = get_object_or_404(Book, slug=slug)
- if not book.has_media('mp3'):
- raise Http404
-
- audiobooks, projects, total_duration = book.get_audiobooks()
-
- return render(
- request,
- 'catalogue/player.html',
- {
- 'book': book,
- 'audiobook': '',
- 'audiobooks': audiobooks,
- 'projects': projects,
})
else:
best = described_tags
- if request.EXPERIMENTS['layout'].value:
- template_name = 'catalogue/2022/tag_catalogue.html'
- else:
- template_name = 'catalogue/tag_catalogue.html'
-
+ template_name = 'catalogue/2022/tag_catalogue.html'
return render(request, template_name, {
'tags': tags,
'best': best,
else:
best = objects
- if request.EXPERIMENTS['layout'].value:
- template_name = 'catalogue/2022/collections.html'
- else:
- template_name = 'catalogue/collections.html'
-
+ template_name = 'catalogue/2022/collections.html'
return render(request, template_name, {
'objects': objects,
'best': best,
fnp / wolnelektury.git / blobdiff