From 1603df0817a50dcf0ad1de5e322d668518941327 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sun, 19 Dec 2021 14:19:35 +1100
Subject: [PATCH] add "Create list" form to group template

---
 bookwyrm/templates/groups/layout.html     | 17 +++++++++++++----
 bookwyrm/templates/lists/create_form.html |  2 +-
 bookwyrm/templates/lists/form.html        | 10 +++++-----
 bookwyrm/views/group.py                   |  1 +
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html
index f558f169..619c89ee 100644
--- a/bookwyrm/templates/groups/layout.html
+++ b/bookwyrm/templates/groups/layout.html
@@ -11,13 +11,22 @@
             {% include 'groups/created_text.html' with group=group %}
         </p>
     </div>
+    {% if request.user == group.user %}
     <div class="column is-narrow is-flex">
-        {% if request.user == group.user %}
-            {% trans "Edit group" as button_text %}
-            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_group" focus="edit_group_header" %}
-        {% endif %}
+        {% trans "Create List" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create_list" icon_with_text="plus" text=button_text focus="create_list_header" %}
     </div>
+    <div class="column is-narrow is-flex">
+        {% trans "Edit group" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_group" focus="edit_group_header" %}
+    </div>
+    {% endif %}
 </header>
+{% if request.user.is_authenticated %}
+<div class="block">
+    {% include 'lists/create_form.html' with controls_text="create_list" curation_group=group %}
+</div>
+{% endif %}
 
 <div class="block content">
     {% include 'snippets/trimmed_text.html' with full=group.description %}
diff --git a/bookwyrm/templates/lists/create_form.html b/bookwyrm/templates/lists/create_form.html
index 447c0f6b..a1bda591 100644
--- a/bookwyrm/templates/lists/create_form.html
+++ b/bookwyrm/templates/lists/create_form.html
@@ -7,6 +7,6 @@
 
 {% block form %}
 <form name="create-list" method="post" action="{% url 'lists' %}">
-    {% include 'lists/form.html' %}
+    {% include 'lists/form.html' with curation_group=group %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 25dc01e6..d2248853 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -19,7 +19,7 @@
             <legend class="label">{% trans "List curation:" %}</legend>
 
             <label class="field" data-hides="list_group_selector">
-                <input type="radio" name="curation" value="closed"{% if not list or list.curation == 'closed' %} checked{% endif %}> {% trans "Closed" %}
+                <input type="radio" name="curation" value="closed"{% if not curation_group.exists or not list or list.curation == 'closed' %} checked{% endif %}> {% trans "Closed" %}
                 <p class="help mb-2">{% trans "Only you can add and remove books to this list" %}</p>
             </label>
 
@@ -34,17 +34,17 @@
             </label>
 
             <label class="field hidden-form">
-                <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
+                <input type="radio" name="curation" value="group"{% if curation_group.id or list.curation == 'group' %} checked{% endif %} > {% trans "Group" %}
                 <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
-                <fieldset class="{% if list.curation != 'group' %}is-hidden{% endif %}" id="list_group_selector">
+                <fieldset class="{% if list.curation != 'group' and not curation_group %}is-hidden{% endif %}" id="list_group_selector">
                 {% if user.memberships.exists %}
                     <label class="label" for="id_group" id="group">{% trans "Select Group" %}</label>
                     <div class="field has-addons">
                         <div class="select control">
                             <select name="group" id="id_group">
-                                <option value="" disabled {% if not list.group %} selected{% endif %}>{% trans "Select a group" %}</option>
+                                <option value="" disabled {% if not list.group and not curation_group %} selected{% endif %}>{% trans "Select a group" %}</option>
                                 {% for membership in user.memberships.all %}
-                                <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
+                                <option value="{{ membership.group.id }}" {% if list.group.id == membership.group.id or curation_group.id == membership.group.id %} selected{% endif %}>{{ membership.group.name }}</option>
                                 {% endfor %}
                             </select>
                         </div>
diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py
index f375ac84..6f1d7596 100644
--- a/bookwyrm/views/group.py
+++ b/bookwyrm/views/group.py
@@ -35,6 +35,7 @@ class Group(View):
             "group": group,
             "lists": lists,
             "group_form": forms.GroupForm(instance=group),
+            "list_form": forms.ListForm(),
             "path": "/group",
         }
         return TemplateResponse(request, "groups/group.html", data)