Merge pull request #966 from bookwyrm-social/user-admin

User admin

bookwyrm/views/__init__.py

@@ -25,7 +25,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report, resolve_report, deactivate_user
+from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
@@ -37,5 +37,5 @@ from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
-from .user_admin import UserAdmin
+from .user_admin import UserAdmin, UserAdminList
 from .wellknown import *

bookwyrm/views/reports.py

@@ -74,12 +74,13 @@ class Report(View):
 
 @login_required
 @permission_required("bookwyrm_moderate_user")
-def deactivate_user(_, report_id):
+def suspend_user(_, user_id):
     """ mark an account as inactive """
-    report = get_object_or_404(models.Report, id=report_id)
-    report.user.is_active = not report.user.is_active
-    report.user.save()
-    return redirect("settings-report", report.id)
+    user = get_object_or_404(models.User, id=user_id)
+    user.is_active = not user.is_active
+    # this isn't a full deletion, so we don't want to tell the world
+    user.save(broadcast=False)
+    return redirect("settings-user", user.id)
 
 
 @login_required

bookwyrm/views/user_admin.py

@@ -1,11 +1,12 @@
 """ manage user """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
 
 
@@ -15,7 +16,7 @@ from bookwyrm.settings import PAGE_LENGTH
     permission_required("bookwyrm.moderate_users", raise_exception=True),
     name="dispatch",
 )
-class UserAdmin(View):
+class UserAdminList(View):
     """ admin view of users on this server """
 
     def get(self, request):
@@ -49,4 +50,28 @@ class UserAdmin(View):
             "sort": sort,
             "server": server,
         }
-        return TemplateResponse(request, "settings/user_admin.html", data)
+        return TemplateResponse(request, "user_admin/user_admin.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_users", raise_exception=True),
+    name="dispatch",
+)
+class UserAdmin(View):
+    """ moderate an individual user """
+
+    def get(self, request, user):
+        """ user view """
+        user = get_object_or_404(models.User, id=user)
+        data = {"user": user, "group_form": forms.UserGroupForm()}
+        return TemplateResponse(request, "user_admin/user.html", data)
+
+    def post(self, request, user):
+        """ update user group """
+        user = get_object_or_404(models.User, id=user)
+        form = forms.UserGroupForm(request.POST, instance=user)
+        if form.is_valid():
+            form.save()
+        data = {"user": user, "group_form": form}
+        return TemplateResponse(request, "user_admin/user.html", data)