mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-06-05 23:38:53 +00:00
Code Issues Projects Releases Wiki Activity

Pass correct user id in Move notification

Browse source 
We were passing the *requesting* user's moved_to value to the Move notification template, instead of the id of the user that they are being notified about.
Additionally, the id_to_username template tag had no fallback for if the user_id is None.

This resolves both problems and removes an unnecessary space in a template for when the logged in user made the move.

Fixes #3196
This commit is contained in:
Hugh Rundle 2024-01-17 21:06:04 +11:00
parent b04ebe397b
commit b990d9ccd8
No known key found for this signature in database
GPG key ID: A7E35779918253F9
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templates/moved.html
View file

@ -23,7 +23,7 @@
<div class="notification is-warning"> <div class="notification is-warning">
<p> <p>
{% id_to_username request.user.moved_to as username %} {% id_to_username request.user.moved_to as username %}
{% blocktrans trimmed with moved_to=user.moved_to %} {% blocktrans trimmed with moved_to=user.moved_to %}
<strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a> <strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a>
{% endblocktrans %} {% endblocktrans %}

2
bookwyrm/templates/notifications/items/move_user.html
View file

@ -14,7 +14,7 @@
{% block description %} {% block description %}
{% if related_user_moved_to %} {% if related_user_moved_to %}
{% id_to_username request.user.moved_to as username %} {% id_to_username related_user_moved_to as username %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
{{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a> {{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a>
{% endblocktrans %} {% endblocktrans %}

3
bookwyrm/templatetags/utilities.py
View file

@ -125,7 +125,8 @@ def id_to_username(user_id):
name = parts[-1] name = parts[-1]
value = f"{name}@{domain}" value = f"{name}@{domain}"
return value return value
return "a new user account"
@register.filter(name="get_file_size") @register.filter(name="get_file_size")