From 9b949d9845ecd3cd521a4bc51b9164adda29cf57 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 10:19:51 -0700
Subject: [PATCH] Merges display of lists to show all

Rather than separating out "your lists"
---
 bookwyrm/templates/lists/list_items.html |  8 +++++++-
 bookwyrm/templates/lists/lists.html      | 26 ++++++++----------------
 bookwyrm/views/list.py                   | 16 ++++++---------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 04e7f014..3e3e8bf4 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,13 @@
                 {% endfor %}
             </div>
             <div class="card-content is-flex-grow-0">
-                {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %}
+                <div {% if list.description %}title="{{ list.description }}"{% endif %}>
+                {% if list.description %}
+                    {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+                {% else %}
+                &nbsp;
+                {% endif %}
+                </div>
                 <p class="subtitle help">
                     {% include 'lists/created_text.html' with list=list %}
                 </p>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index f7ab020a..a9258305 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,17 +1,19 @@
 {% extends 'layout.html' %}
+{% load bookwyrm_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "Lists" %}{% endblock %}
 
 {% block content %}
 
-<header class="block">
-    <h1 class="title">{% trans "Lists" %}</h1>
-</header>
-{% if request.user.is_authenticated and not lists.has_previous %}
 <header class="block columns is-mobile">
     <div class="column">
-        <h2 class="title">{% trans "Your lists" %}</h2>
+        <h1 class="title">
+            {% trans "Lists" %}
+            {% if request.user.is_authenticated %}
+            <a class="help has-text-weight-normal" href="{% url 'user-lists' request.user|username %}">Your lists</a>
+            {% endif %}
+        </h1>
     </div>
     <div class="column is-narrow">
         {% trans "Create List" as button_text %}
@@ -23,23 +25,11 @@
     {% include 'lists/create_form.html' with controls_text="create-list" %}
 </div>
 
-<section class="block content">
-    {% if request.user.list_set.exists %}
-    {% include 'lists/list_items.html' with lists=request.user.list_set.all|slice:4 %}
-    {% endif %}
-
-    {% if request.user.list_set.count > 4 %}
-    <a href="{% url 'user-lists' request.user.localname %}">{% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %}</a>
-    {% endif %}
-</section>
-{% endif %}
-
-
 {% if lists %}
 <section class="block content">
-    <h2 class="title">{% trans "Recent Lists" %}</h2>
     {% include 'lists/list_items.html' with lists=lists %}
 </section>
+
 <div>
     {% include 'snippets/pagination.html' with page=lists path=path %}
 </div>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 91475d48..5c88e189 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -27,17 +27,13 @@ class Lists(View):
         except ValueError:
             page = 1
 
-        user = request.user if request.user.is_authenticated else None
         # hide lists with no approved books
-        lists = (
-            models.List.objects.filter(
-                ~Q(user=user),
-            )
-            .annotate(item_count=Count("listitem", filter=Q(listitem__approved=True)))
-            .filter(item_count__gt=0)
-            .distinct()
-            .all()
-        )
+        lists = models.List.objects.annotate(
+            item_count=Count("listitem", filter=Q(listitem__approved=True))
+        ).filter(
+            item_count__gt=0
+        ).distinct().all()
+
         lists = privacy_filter(
             request.user, lists, privacy_levels=["public", "followers"]
         )