From f32a2cc4d00d954732ca3a11de7eb735ddd0182d Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Fri, 24 Sep 2021 15:04:52 +1000 Subject: [PATCH] group creation form can now be submitted! Whoops --- bookwyrm/templates/groups/create_form.html | 2 +- bookwyrm/templates/groups/form.html | 8 ++++---- bookwyrm/views/group.py | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html index b469ce00..103ce223 100644 --- a/bookwyrm/templates/groups/create_form.html +++ b/bookwyrm/templates/groups/create_form.html @@ -6,7 +6,7 @@ {% endblock %} {% block form %} -
+ {% include 'group/form.html' %}
{% endblock %} diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html index e640fd26..38df17a6 100644 --- a/bookwyrm/templates/groups/form.html +++ b/bookwyrm/templates/groups/form.html @@ -14,12 +14,12 @@ -
@@ -31,4 +31,4 @@ {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_group" controls_uid=group.id focus="modal_title_delete_group" %} {% endif %} - --> + diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py index f90537b8..83cc3b05 100644 --- a/bookwyrm/views/group.py +++ b/bookwyrm/views/group.py @@ -59,8 +59,9 @@ class UserGroups(View): def get(self, request, username): """display a group""" user = get_user_from_username(request.user, username) - groups = models.GroupMember.objects.filter(user=user) - groups = privacy_filter(request.user, groups) + # groups = models.GroupMember.objects.filter(user=user) + groups = models.Group.objects.filter(members=request.user) + # groups = privacy_filter(request.user, groups) paginated = Paginator(groups, 12) data = {