From ba6953c051c43faa5e9af31a27faeda22d443a56 Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Fri, 10 May 2019 14:29:58 +0100
Subject: [PATCH] only allow comments to be editable from the application
detail page
---
.../activity/include/listing_base.html | 37 ++++++++++++-------
.../funds/applicationsubmission_detail.html | 2 +-
.../funds/includes/activity-feed.html | 2 +-
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index a9eb4e27a..670772603 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -7,17 +7,21 @@
<div class="feed__meta js-feed-meta">
<p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
<p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
- {% if activity.user == request.user %}
- <p class="feed__meta-item feed__meta-item--edit-button">
- <a class="link link--edit-submission is-active js-edit-comment" href="#">
- Edit
- <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
- </a>
- </p>
- {% endif %}
- {% if activity.edited %}
- <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited|date:"Y-m-d H:i" }}</span>)</p>
+
+ {% if editable %}
+ {% if activity.user == request.user %}
+ <p class="feed__meta-item feed__meta-item--edit-button">
+ <a class="link link--edit-submission is-active js-edit-comment" href="#">
+ Edit
+ <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
+ </a>
+ </p>
+ {% endif %}
+ {% if activity.edited %}
+ <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited|date:"Y-m-d H:i" }}</span>)</p>
+ {% endif %}
{% endif %}
+
{% if activity.private %}
<p class="feed__meta-item feed__meta-item--right">
<svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
@@ -25,16 +29,21 @@
</p>
{% endif %}
</div>
+
<p class="feed__heading">
{% if submission_title %}
updated <a href="{{ activity.submission.get_absolute_url }}">{{ activity.submission.title }}</a>
{% endif %}
- <div class="feed__comment js-comment" data-id="{{activity.id}}" data-comment="{{activity.message|to_markdown}}">
- {{ activity|display_for:request.user|submission_links|markdown|bleach }}
- </div>
+ {% if editable %}
+ <div class="feed__comment js-comment" data-id="{{activity.id}}" data-comment="{{activity.message|to_markdown}}">
+ {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+ </div>
- <div class="js-edit-block" aria-live="polite"></div>
+ <div class="js-edit-block" aria-live="polite"></div>
+ {% else %}
+ {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+ {% endif %}
{% if not submission_title and activity|user_can_see_related:request.user %}
{% with url=activity.related_object.get_absolute_url %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
index 1fe5bdc00..f213ec869 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -141,7 +141,7 @@
<div class="tabs__content" id="tab-2">
<div class="feed">
{% include "activity/include/comment_form.html" %}
- {% include "activity/include/comment_list.html" %}
+ {% include "activity/include/comment_list.html" with editable=True %}
</div>
</div>
diff --git a/opentech/apply/funds/templates/funds/includes/activity-feed.html b/opentech/apply/funds/templates/funds/includes/activity-feed.html
index 0a3595a6d..37117315c 100644
--- a/opentech/apply/funds/templates/funds/includes/activity-feed.html
+++ b/opentech/apply/funds/templates/funds/includes/activity-feed.html
@@ -15,7 +15,7 @@
<div class="wrapper wrapper--medium wrapper--activity-feed js-tabs-content">
<div class="tabs__content tabs__content--current" id="tab-1">
- {% include "activity/include/comment_list.html" with submission_title=True %}
+ {% include "activity/include/comment_list.html" with submission_title=True editable=False %}
</div>
<div class="tabs__content" id="tab-2">
--
GitLab