From 251b72488d27f769ed0574f39a91f5d2da3d27a6 Mon Sep 17 00:00:00 2001
From: Radek Czajka <rczajka@rczajka.pl>
Date: Wed, 5 May 2021 10:03:13 +0200
Subject: [PATCH] Unlisted collections.

---
 src/catalogue/admin.py                        |   1 +
 src/catalogue/api/views.py                    |   2 +-
 src/catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 12599 -> 12633 bytes
 src/catalogue/locale/pl/LC_MESSAGES/django.po |  19 +++++++++---------
 .../migrations/0032_collection_listed.py      |  18 +++++++++++++++++
 src/catalogue/models/collection.py            |   1 +
 src/catalogue/views.py                        |   4 ++--
 src/wolnelektury/views.py                     |   4 ++--
 8 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 src/catalogue/migrations/0032_collection_listed.py

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index adc2eaf74..997dd5ed0 100644
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -43,6 +43,7 @@ class FragmentAdmin(admin.ModelAdmin):
 
 
 class CollectionAdmin(admin.ModelAdmin):
+    list_display = ('title', 'listed')
     prepopulated_fields = {'slug': ('title',)}
 
 
diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index bcfe0adfb..885df24aa 100644
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -27,7 +27,7 @@ book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 
 class CollectionList(ListAPIView):
-    queryset = Collection.objects.all()
+    queryset = Collection.objects.filter(listed=True)
     serializer_class = serializers.CollectionListSerializer
 
 
diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.mo b/src/catalogue/locale/pl/LC_MESSAGES/django.mo
index edd1fa1ac71acfd61d0504bf7a3eae3775e758b0..4ce940facc694332c68b83787a8c6e0fe16d4fb2 100644
GIT binary patch
delta 3667
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

delta 3633
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
HVUX{CU=whV

diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.po b/src/catalogue/locale/pl/LC_MESSAGES/django.po
index 3dc983240..eb9230335 100644
--- a/src/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-01-27 10:47+0100\n"
+"PO-Revision-Date: 2021-05-05 10:02+0200\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
@@ -195,7 +195,7 @@ msgstr "dodatkowe informacje"
 msgid "print on demand"
 msgstr "druk na żądanie"
 
-#: catalogue/models/book.py:73 catalogue/models/collection.py:22
+#: catalogue/models/book.py:73 catalogue/models/collection.py:23
 msgid "recommended"
 msgstr "polecane"
 
@@ -253,11 +253,11 @@ msgstr "Utwór \"%s\" nie istnieje."
 msgid "Book %s already exists"
 msgstr "Książka %s już istnieje"
 
-#: catalogue/models/book.py:853
+#: catalogue/models/book.py:857
 msgid "This work needs modernisation"
 msgstr "Ten utwór wymaga uwspółcześnienia"
 
-#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:33
+#: catalogue/models/book.py:936 catalogue/models/bookmedia.py:33
 #, python-format
 msgid "%s file"
 msgstr "plik %s"
@@ -299,11 +299,15 @@ msgstr "rodzaj"
 msgid "picture"
 msgstr "obraz"
 
-#: catalogue/models/collection.py:27
+#: catalogue/models/collection.py:20
+msgid "listed"
+msgstr "na liście"
+
+#: catalogue/models/collection.py:28
 msgid "collection"
 msgstr "kolekcja"
 
-#: catalogue/models/collection.py:28
+#: catalogue/models/collection.py:29
 msgid "collections"
 msgstr "kolekcje"
 
@@ -990,9 +994,6 @@ msgstr "Błąd podczas importowania pliku: %r"
 #~ msgid "for advanced usage"
 #~ msgstr "do zadań specjalnych"
 
-#~ msgid "Listen"
-#~ msgstr "Słuchaj"
-
 #~ msgid "See"
 #~ msgstr "Zobacz"
 
diff --git a/src/catalogue/migrations/0032_collection_listed.py b/src/catalogue/migrations/0032_collection_listed.py
new file mode 100644
index 000000000..52c9ccd02
--- /dev/null
+++ b/src/catalogue/migrations/0032_collection_listed.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.19 on 2021-05-05 07:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0031_auto_20210316_1446'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='listed',
+            field=models.BooleanField(db_index=True, default=True, verbose_name='listed'),
+        ),
+    ]
diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index d964762ba..6f956c73e 100644
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -17,6 +17,7 @@ class Collection(models.Model):
     book_slugs = models.TextField(_('book slugs'))
     kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True,
                             choices=(('book', _('book')), ('picture', _('picture'))))
+    listed = models.BooleanField(_('listed'), default=True, db_index=True)
     role = models.CharField(max_length=128, blank=True, db_index=True, choices=[
         ('', '–'),
         ('recommend', _('recommended')),
diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 398c61cc4..904cdc531 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -36,7 +36,7 @@ def catalogue(request):
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
         'pictures': Picture.objects.all(),
-        'collections': Collection.objects.all(),
+        'collections': Collection.objects.filter(listed=True),
         'active_menu_item': 'all_works',
     })
 
@@ -452,7 +452,7 @@ def tag_catalogue(request, category):
 
 
 def collections(request):
-    objects = Collection.objects.all()
+    objects = Collection.objects.filter(listed=True)
 
     if len(objects) > 3:
         best = random.sample(list(objects), 3)
diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 1c0f40cd3..48063d29b 100644
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -48,13 +48,13 @@ def main_page(request):
 
     # Choose a collection for main.
     try:
-        ctx['collection'] = Collection.objects.order_by('?')[:1][0]
+        ctx['collection'] = Collection.objects.filter(listed=True).order_by('?')[:1][0]
     except IndexError:
         pass
 
     best = []
     best_places = 5
-    for recommended in Collection.objects.filter(role='recommend').order_by('?'):
+    for recommended in Collection.objects.filter(listed=True, role='recommend').order_by('?'):
         books = list(recommended.get_books().exclude(id__in=[b.id for b in best]).order_by('?')[:best_places])
         best.extend(books)
         best_places -= len(books)
-- 
2.20.1