Pass correct user id in Move notification

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

View file

@ -14,7 +14,7 @@
{% block description %}
{% 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 %}
{{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a>
{% endblocktrans %}

View file

@ -126,6 +126,7 @@ def id_to_username(user_id):
value = f"{name}@{domain}"
return value
return "a new user account"
@register.filter(name="get_file_size")