Skip to content

Show "message from determination" for comments linked to determinations. #4980

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

Open
frjo wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

Show "message from determination" for comments linked to determinations. #4980

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
6 changes: 5 additions & 1 deletion hypha/apply/activity/templates/activity/ui/activity-comment-item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@
<a href="#communications--{{activity.id}}" class="flex gap-1 hover:underline">
<span class="text-fg-muted">
{% if not submission_title and activity|user_can_see_related:request.user %}
{% blocktrans with related_name=activity.related_object|model_verbose_name|with_indefinite_article %}commented on {{ related_name }}{% endblocktrans %}
{% if activity.related_object|is_determination %}
{% trans "message from determination" %}
{% else %}
{% blocktrans with related_name=activity.related_object|model_verbose_name|with_indefinite_article %}commented on {{ related_name }}{% endblocktrans %}
{% endif %}
{% else %}
{% trans "commented" %}
{% endif %}
Expand Down
6 changes: 6 additions & 0 deletions hypha/apply/utils/templatetags/apply_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ def instance_verbose_name(instance):
return model_verbose_name(instance)


@register.filter
def is_determination(instance):
Determination = apps.get_model("determinations", "Determination")
return isinstance(instance, Determination)


@register.filter
def format_number_as_currency(amount: float | decimal.Decimal | str | None):
"""Formats a number as currency"""
Expand Down