Skip to content

user mentioning: diplay author instead of recipient #13332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

user mentioning: diplay author instead of recipient #13332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dojo/templates/notifications/alert/user_mentioned.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load i18n %}{% blocktranslate trimmed %}
User {{ user }} jotted a note on {{ section }}{% endblocktranslate %}:
User {{ requested_by }} jotted a note on {{ section }}{% endblocktranslate %}:

{{ note }}
2 changes: 1 addition & 1 deletion dojo/templates/notifications/mail/user_mentioned.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</p>
<p>
{% blocktranslate trimmed %}
User {{ user }} jotted a note on {{ section }}:<br/>
User {{ requested_by }} jotted a note on {{ section }}:<br/>
<br/>
{{ note }}<br/>
<br/>
Expand Down
4 changes: 2 additions & 2 deletions dojo/templates/notifications/msteams/user_mentioned.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ NOTE: This template is currently NOT USED in practice because:
},
{
"type": "TextBlock",
"text": "{% trans 'User' %} {{ user }} {% trans 'mentioned you in' %} {{ section }}.",
"text": "{% trans 'User' %} {{ requested_by }} {% trans 'mentioned you in' %} {{ section }}.",
"wrap": true,
"spacing": "Medium"
},
Expand All @@ -63,7 +63,7 @@ NOTE: This template is currently NOT USED in practice because:
"facts": [
{
"title": "{% trans 'User' %}:",
"value": "{{ user }}"
"value": "{{ requested_by }}"
},
{
"title": "{% trans 'Section' %}:",
Expand Down
4 changes: 2 additions & 2 deletions dojo/templates/notifications/slack/user_mentioned.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% load i18n %}{% blocktranslate trimmed %}
User {{ user }} jotted a note on {{ section }}:
User {{ requested_by }} jotted a note on {{ section }}:

{{ note }}

Full details of the note can be reviewed at {{ url }}
{% endblocktranslate %}
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}

{% trans "Disclaimer" %}:
{{ system_settings.disclaimer_notifications }}
{% endif %}
3 changes: 2 additions & 1 deletion dojo/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,8 @@ def process_tag_notifications(request, note, parent_url, parent_title):
title=f"{request.user} jotted a note",
url=parent_url,
icon="commenting",
recipients=users_to_notify)
recipients=users_to_notify,
requested_by=get_current_user())


def encrypt(key, iv, plaintext):
Expand Down