From 91534aff827361dea1b99af02fa4015cec2aa3d1 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 16 Oct 2021 16:39:50 +1100 Subject: [PATCH] group view fixes - fix form details not appearing in group member search view - fix query term appearing in main search box when searching for new members - direct request user back to the group rather than the user when adding a user to a group --- bookwyrm/views/group.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py index 3e510a4d..2623361d 100644 --- a/bookwyrm/views/group.py +++ b/bookwyrm/views/group.py @@ -94,7 +94,7 @@ class FindUsers(View): def get(self, request, group_id): """basic profile info""" - query = request.GET.get("query") + user_query = request.GET.get("user_query") group = get_object_or_404(models.Group, id=group_id) if not group: @@ -110,8 +110,8 @@ class FindUsers(View): ) # don't suggest users who are already members .annotate( similarity=Greatest( - TrigramSimilarity("username", query), - TrigramSimilarity("localname", query), + TrigramSimilarity("username", user_query), + TrigramSimilarity("localname", user_query), ) ) .filter(similarity__gt=0.5, local=True) @@ -127,7 +127,8 @@ class FindUsers(View): data = { "suggested_users": user_results, "group": group, - "query": query, + "group_form": forms.GroupForm(instance=group), + "user_query": user_query, "requestor_is_manager": request.user == group.user, } return TemplateResponse(request, "groups/find_users.html", data) @@ -222,7 +223,7 @@ def remove_member(request): notification_type=notification_type, ) - return redirect(user.local_path) + return redirect(group.local_path) @require_POST