diff --git a/books/templates/books/list.html b/books/templates/books/list.html index 3a0c57bd..e507a21e 100644 --- a/books/templates/books/list.html +++ b/books/templates/books/list.html @@ -162,7 +162,7 @@ {% if request.user != user %} - {% trans '举报用户' %} + {% trans '举报用户' %} {% endif %} diff --git a/books/templates/books/scrape.html b/books/templates/books/scrape.html index 97bb570f..5cd1ac21 100644 --- a/books/templates/books/scrape.html +++ b/books/templates/books/scrape.html @@ -31,7 +31,8 @@ - + {% trans '登出' %} {% trans '主页' %} {% if request.user.is_staff %} diff --git a/common/templates/common/home.html b/common/templates/common/home.html index 7b935c56..d17765a7 100644 --- a/common/templates/common/home.html +++ b/common/templates/common/home.html @@ -121,7 +121,7 @@ {% if request.user != user %} - {% trans '举报用户' %} + {% trans '举报用户' %} {% endif %} diff --git a/users/forms.py b/users/forms.py index 5b063853..cf04969a 100644 --- a/users/forms.py +++ b/users/forms.py @@ -13,4 +13,9 @@ class ReportForm(forms.ModelForm): ] widgets = { 'message': forms.Textarea(attrs={'placeholder': _("详情")}), - } \ No newline at end of file + } + labels = { + 'reported_user': _("举报的用户"), + 'image': _("相关证据"), + 'message': _("详情") + } \ No newline at end of file diff --git a/users/templates/users/list.html b/users/templates/users/list.html index e5b3c781..fec4435b 100644 --- a/users/templates/users/list.html +++ b/users/templates/users/list.html @@ -84,7 +84,7 @@ {% if request.user != user %} - {% trans '举报用户' %} + {% trans '举报用户' %} {% endif %} diff --git a/users/views.py b/users/views.py index 4f88b6a8..2814c445 100644 --- a/users/views.py +++ b/users/views.py @@ -118,7 +118,7 @@ def delete(request): @login_required def home(request, id): if request.method == 'GET': - if request.GET.get('is_mastodon_id') in ['true', 'True']: + if request.GET.get('is_mastodon_id', '').lower() == 'true': query_kwargs = {'mastodon_id': id} else: query_kwargs = {'pk': id} @@ -309,7 +309,12 @@ def book_list(request, id, status): @login_required def report(request): if request.method == 'GET': - form = ReportForm() + user_id = request.GET.get('user_id') + if user_id: + user = get_object_or_404(User, pk=user_id) + form = ReportForm(initial={'reported_user': user}) + else: + form = ReportForm() return render( request, 'users/report.html',