Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix report related issues

Browse source
This commit is contained in:
doubaniux 2020-05-07 18:00:39 +08:00
parent 6eebfe67b8
commit 89094ff262
6 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
books/templates/books/list.html
View file

@ -162,7 +162,7 @@
<!-- <a href="#" class="follow">{% trans '关注TA' %}</a> --> <!-- <a href="#" class="follow">{% trans '关注TA' %}</a> -->
{% if request.user != user %} {% if request.user != user %}
<a href="#" class="report">{% trans '举报用户' %}</a> <a href="{% url 'users:report' %}?user_id={{ user.id }}" class="report">{% trans '举报用户' %}</a>
{% endif %} {% endif %}
</div> </div>

3
books/templates/books/scrape.html
View file

@ -31,7 +31,8 @@
<a href="{% url 'common:home' %}"> <a href="{% url 'common:home' %}">
<img src="{% static 'img/logo.svg' %}" alt="" class="logo"> <img src="{% static 'img/logo.svg' %}" alt="" class="logo">
</a> </a>
<input type="search" class="search-box" name="keywords" id="searchInput" required="true" placeholder="{% trans '搜索书影音，多个关键字以空格分割' %}"> <input type="search" class="search-box" name="keywords"
value="{% if request.GET.keywords %}{{ request.GET.keywords }}{% endif %}" id="searchInput" required="true" placeholder="{% trans '搜索书影音，多个关键字以空格分割' %}">
<a class="nav-link" id="logoutLink" href="{% url 'users:logout' %}">{% trans '登出' %}</a> <a class="nav-link" id="logoutLink" href="{% url 'users:logout' %}">{% trans '登出' %}</a>
<a class="nav-link" href="{% url 'common:home' %}">{% trans '主页' %}</a> <a class="nav-link" href="{% url 'common:home' %}">{% trans '主页' %}</a>
{% if request.user.is_staff %} {% if request.user.is_staff %}

2
common/templates/common/home.html
View file

@ -121,7 +121,7 @@
<!-- <a href="#" class="follow">{% trans '关注TA' %}</a> --> <!-- <a href="#" class="follow">{% trans '关注TA' %}</a> -->
{% if request.user != user %} {% if request.user != user %}
<a href="{% url 'users:report' %}" class="report">{% trans '举报用户' %}</a> <a href="{% url 'users:report' %}?user_id={{ user.id }}" class="report">{% trans '举报用户' %}</a>
{% endif %} {% endif %}
</div> </div>

7
users/forms.py
View file

@ -13,4 +13,9 @@ class ReportForm(forms.ModelForm):
] ]
widgets = { widgets = {
'message': forms.Textarea(attrs={'placeholder': _("详情")}), 'message': forms.Textarea(attrs={'placeholder': _("详情")}),
} }
labels = {
'reported_user': _("举报的用户"),
'image': _("相关证据"),
'message': _("详情")
}

2
users/templates/users/list.html
View file

@ -84,7 +84,7 @@
<!-- <a href="#" class="follow">{% trans '关注TA' %}</a> --> <!-- <a href="#" class="follow">{% trans '关注TA' %}</a> -->
{% if request.user != user %} {% if request.user != user %}
<a href="#" class="report">{% trans '举报用户' %}</a> <a href="{% url 'users:report' %}?user_id={{ user.id }}" class="report">{% trans '举报用户' %}</a>
{% endif %} {% endif %}
</div> </div>

9
users/views.py
View file

@ -118,7 +118,7 @@ def delete(request):
@login_required @login_required
def home(request, id): def home(request, id):
if request.method == 'GET': 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} query_kwargs = {'mastodon_id': id}
else: else:
query_kwargs = {'pk': id} query_kwargs = {'pk': id}
@ -309,7 +309,12 @@ def book_list(request, id, status):
@login_required @login_required
def report(request): def report(request):
if request.method == 'GET': 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( return render(
request, request,
'users/report.html', 'users/report.html',