- {% with activity|display_activity_author:request.user as author_name %}
-
-
-
- {% user_image author_name size=25 %}
+ {% if not mini %}
+ /", partial_comments, name="partial-comments"),
path("/edit-comment/", edit_comment, name="edit-comment"),
path("/delete-comment/", delete_comment, name="delete-comment"),
+ path("post-comment/", post_comment, name="post-comment"),
path(
"activities/attachment//download/",
AttachmentView.as_view(),
diff --git a/hypha/apply/activity/views.py b/hypha/apply/activity/views.py
index 9933a2af42..6301069961 100644
--- a/hypha/apply/activity/views.py
+++ b/hypha/apply/activity/views.py
@@ -1,13 +1,21 @@
+import json
+
from django.contrib.auth.decorators import login_required, user_passes_test
-from django.core.exceptions import PermissionDenied
+from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import PermissionDenied, ValidationError
from django.core.paginator import Paginator
+from django.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, render
+from django.utils import timezone
from django.utils.decorators import method_decorator
+from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
from django.views.decorators.http import require_http_methods
from django.views.generic import ListView
from rolepermissions.checkers import has_object_permission
+from hypha.apply.activity.forms import CommentForm
+from hypha.apply.activity.messaging import MESSAGES, messenger
from hypha.apply.funds.models.submissions import ApplicationSubmission
from hypha.apply.users.decorators import is_apply_staff, staff_required
from hypha.apply.utils.storage import PrivateMediaView
@@ -17,6 +25,36 @@
from .models import COMMENT, Activity, ActivityAttachment
+def _get_object_for_content_type(content_type_id, object_id):
+ """Resolve a content type id & object id pair into a model instance.
+
+ Both ids come straight from user input, so anything that doesn't resolve to
+ an existing object - missing, non-numeric or dangling ids, or a stale
+ ContentType row whose model no longer exists - returns None rather than
+ raising.
+
+ Args:
+ content_type_id: the pk of the ContentType of the object
+ object_id: the pk of the object itself
+
+ Returns:
+ The model instance, or None if it could not be resolved
+ """
+ try:
+ content_type = ContentType.objects.get_for_id(int(content_type_id))
+ except (TypeError, ValueError, ContentType.DoesNotExist):
+ return None
+
+ model_class = content_type.model_class()
+ if model_class is None:
+ return None
+
+ try:
+ return model_class._default_manager.filter(pk=object_id).first()
+ except (TypeError, ValueError, ValidationError):
+ return None
+
+
@login_required
@require_http_methods(["GET"])
def partial_comments(request, pk: int):
@@ -110,6 +148,69 @@ def delete_comment(request, pk):
)
+@login_required
+@require_http_methods(["POST", "GET"])
+@user_passes_test(is_apply_staff)
+def post_comment(request: HttpRequest):
+ if request.method == "POST":
+ form = CommentForm(user=request.user, data=request.POST or None, mini=True)
+ source = _get_object_for_content_type(
+ request.POST.get("source_content_type"),
+ request.POST.get("source_object_id"),
+ )
+ if source is None:
+ raise Http404
+
+ form.instance.user = request.user
+ form.instance.source = source
+ form.instance.type = COMMENT
+ form.instance.timestamp = timezone.now()
+ if form.is_valid():
+ obj = form.save()
+ messenger(
+ MESSAGES.COMMENT,
+ request=request,
+ user=request.user,
+ source=source,
+ related=obj,
+ )
+ return HttpResponse(
+ status=204,
+ headers={
+ "HX-Trigger": json.dumps(
+ {
+ "commentAdded": obj.pk,
+ "showMessage": mark_safe(_("Comment added!")),
+ }
+ ),
+ },
+ )
+ return render(request, "activity/partials/comment_form.html", {"form": form})
+ else:
+ form = CommentForm(user=request.user, mini=True)
+ params = request.GET.dict()
+
+ # Ensure the provided source content type & object actually exist
+ source_content_type = params.get("source_content_type")
+ source_object_id = params.get("source_object_id")
+ if _get_object_for_content_type(source_content_type, source_object_id) is None:
+ raise Http404
+
+ form.fields["source_content_type"].initial = source_content_type
+ form.fields["source_object_id"].initial = source_object_id
+
+ related_content_type = params.get("related_content_type")
+ related_object_id = params.get("related_object_id")
+ if (
+ _get_object_for_content_type(related_content_type, related_object_id)
+ is not None
+ ):
+ form.fields["related_content_type"].initial = related_content_type
+ form.fields["related_object_id"].initial = related_object_id
+
+ return render(request, "activity/partials/comment_form.html", {"form": form})
+
+
class ActivityContextMixin:
"""Mixin to add related 'comments' of the current view's 'self.object'"""
diff --git a/hypha/apply/funds/templates/funds/comments.html b/hypha/apply/funds/templates/funds/comments.html
index c6e9f3e3c8..57974df0c9 100644
--- a/hypha/apply/funds/templates/funds/comments.html
+++ b/hypha/apply/funds/templates/funds/comments.html
@@ -43,7 +43,7 @@
{% if form %}
{% if not object.is_archive or object.projects.exists %}
+ {% with activity|display_activity_author:request.user as author_name %}
+
-
+
-
+
+ {% user_image author_name size=25 %}
+
-
-
+ {% endif %}
diff --git a/hypha/apply/activity/urls.py b/hypha/apply/activity/urls.py
index bd26613df1..f3c45dcd47 100644
--- a/hypha/apply/activity/urls.py
+++ b/hypha/apply/activity/urls.py
@@ -6,6 +6,7 @@
delete_comment,
edit_comment,
partial_comments,
+ post_comment,
)
app_name = "activity"
@@ -17,6 +18,7 @@
path("comments/
-
+
+ {% else %}
+
+
+
-
{{ author_name }}
{% if not request.user.is_applicant %}
@@ -33,88 +41,185 @@
{% endif %}
-
- {% trans "commented" %}
+
+
+ {% 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 %}
+ {% else %}
+ {% trans "commented" %}
+ {% endif %}
+
{{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}
-
-
+
- {% if not request.user.is_applicant %}
- {% if request.user.is_apply_staff and activity.assigned_to %}
-
- {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
- {% if activity.assigned_to.id == request.user.id %}
- {% trans "Assigned to you" %}
- {% else %}
- {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
- {% endif %}
-
+
+ {% endwith %}
+
+ {% if not request.user.is_applicant %}
+ {% if request.user.is_apply_staff and activity.assigned_to %}
+
+ {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
+ {% if activity.assigned_to.id == request.user.id %}
+ {% trans "Assigned to you" %}
+ {% else %}
+ {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
+ {% endif %}
+
+ {% endif %}
+
+ {% with activity.visibility|visibility_display:request.user as visibility_text %}
+
+ {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
+ {{ visibility_text }}
+
+ {% endwith %}
{% endif %}
- {% with activity.visibility|visibility_display:request.user as visibility_text %}
-
- {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
- {{ visibility_text }}
-
- {% endwith %}
- {% endif %}
+ {% if editable and activity.user == request.user and not activity.deleted %}
+
+ {% heroicon_micro "pencil-square" aria_hidden=true %}
+ {% trans "Edit" %}
+
+ {% endif %}
- {% if editable and activity.user == request.user and not activity.deleted %}
-
- {% heroicon_micro "pencil-square" aria_hidden=true %}
- {% trans "Edit" %}
-
+ {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
+
+ {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
+ {% trans "Delete" %}
+
+ {% endif %}
+
+
+
+
+ {% if submission_title %}
+ {% trans "updated" %} {{ activity.source.title }}
{% endif %}
- {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
-
- {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
- {% trans "Delete" %}
-
+
-
+
+ {% include 'activity/partial_comment_message.html' with activity=activity %}
+
+ {% if not submission_title and activity|user_can_see_related:request.user %}
+ {% with url=activity.related_object.get_absolute_url %}
+ {% if url %}
+
+ {% endif %}
+ {% endwith %}
{% endif %}
+ {% with activity|display_activity_author:request.user as author_name %}
+
+ {% endwith %}
+
+
+
- {% endwith %}
-
+ {{ author_name }}
-
-
- {% if submission_title %}
- {% trans "updated" %} {{ activity.source.title }}
- {% endif %}
+ {% if not request.user.is_applicant %}
+
+ {% for role in activity.user.get_role_names %}
+
+ {{ role }}
+
+ {% endfor %}
+
+ {% endif %}
- {{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}
+
+
+
+
- {% include 'activity/partial_comment_message.html' with activity=activity %}
-
+
+ {% trans "commented" %}
+
+ {% if not request.user.is_applicant %}
+ {% if request.user.is_apply_staff and activity.assigned_to %}
+
+ {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
+ {% if activity.assigned_to.id == request.user.id %}
+ {% trans "Assigned to you" %}
+ {% else %}
+ {% blocktrans with activity.assigned_to.full_name as assigned_to %}Assigned to {{ assigned_to }}{% endblocktrans %}
+ {% endif %}
+
+ {% endif %}
- {% if not submission_title and activity|user_can_see_related:request.user %}
- {% with url=activity.related_object.get_absolute_url %}
- {% if url %}
-
+ {% with activity.visibility|visibility_display:request.user as visibility_text %}
+
+ {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
+ {{ visibility_text }}
+
+ {% endwith %}
{% endif %}
- {% endwith %}
- {% endif %}
+
+ {% if editable and activity.user == request.user and not activity.deleted %}
+
+ {% heroicon_micro "pencil-square" aria_hidden=true %}
+ {% trans "Edit" %}
+
+ {% endif %}
+
+ {% if editable and activity.user == request.user and not activity.deleted and request.user.is_apply_staff %}
+
+ {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}
+ {% trans "Delete" %}
+
+ {% endif %}
+
+
+
+
+ {% if submission_title %}
+ {% trans "updated" %} {{ activity.source.title }}
+ {% endif %}
+
+
+ {% include 'activity/partial_comment_message.html' with activity=activity %}
+
+ {% trans "Add communication" %}
-
+