X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d019a9b5e928dcf777852d0c8d5413fd3d69b4dd..HEAD:/src/social/templatetags/social_tags.py

diff --git a/src/social/templatetags/social_tags.py b/src/social/templatetags/social_tags.py
index 0135792ce..a4b0f3ed2 100644
--- a/src/social/templatetags/social_tags.py
+++ b/src/social/templatetags/social_tags.py
@@ -1,11 +1,11 @@
-# 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 Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 import re
 from django import template
 from django.utils.functional import lazy
 from django.utils.cache import add_never_cache_headers
-from catalogue.models import Book
+from catalogue.models import Book, Fragment
 from social.utils import likes, get_or_choose_cite, choose_cite as cs
 from ..models import Carousel, Cite
 
@@ -25,8 +25,11 @@ def choose_cite(context, book_id=None, tag_ids=None):
 
 
 @register.simple_tag
-def choose_cites(book, number):
-    return  book.choose_fragments(number) # todo: cites?
+def choose_cites(number, book=None, author=None):
+    if book is not None:
+        return book.choose_fragments(number) # todo: cites?
+    elif author is not None:
+        return Fragment.tagged.with_all([author]).order_by('?')[:number]
 
 
 @register.simple_tag(takes_context=True)
@@ -50,35 +53,9 @@ def book_shelf_tags(context, book_id):
 
 @register.inclusion_tag('social/carousel.html', takes_context=True)
 def carousel(context, placement):
-    carousel = Carousel.get(placement)
-    banners = [
-            item.get_banner()
-            for item in carousel.carouselitem_set.all().select_related('banner')
-            ]
-
-    request = context['request']
-    if 'banner' in request.GET:
-        try:
-            banner_id = int(request.GET['banner'])
-        except (TypeError, ValueError):
-            pass
-        else:
-            try:
-                index = [b.pk for b in banners].index(banner_id)
-            except ValueError:
-                if request.user.is_staff:
-                    # Staff is allowed to preview any banner.
-                    try:
-                        banners.insert(0, Cite.objects.get(pk=banner_id))
-                    except Cite.DoesNotExist:
-                        pass
-            else:
-                # Put selected banner to front.
-                banners = [banners[index]] + banners[:index] + banners[index+1:]
-
+    banners = Carousel.get(placement).carouselitem_set.all()#first().get_banner()
     return {
-        'carousel': carousel,
-        'banners': banners,
+        'banners': [b.get_banner() for b in banners],
     }