From 31e2e1f0e1058725fa80caf64b9a74ef48fe5140 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 31 Aug 2018 20:13:38 +0100
Subject: [PATCH] Change the last_edit fate to use the live_revision which is
correct
---
opentech/apply/funds/models/submissions.py | 6 ------
.../funds/templates/funds/applicationsubmission_detail.html | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 53ea46085..2c58f5edb 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -324,12 +324,6 @@ class ApplicationSubmission(
def active(self):
return self.status in active_statuses
- @property
- def last_edit(self):
- # Best estimate of last edit
- # TODO update when we have revisioning included
- return self.activities.first()
-
def ensure_user_has_account(self):
if self.user and self.user.is_authenticated:
self.form_data['email'] = self.user.email
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
index b37da93f9..1e8b7798b 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -58,7 +58,7 @@
<div>
<h6 class="heading heading--submission-meta">
<span>Submitted: <strong>{{ object.submit_time.date }} by {{ object.user.get_full_name }}</strong></span>
- <span>Last edited: <strong>{{ object.last_edit.timestamp.date }} by {{ object.last_edit.user.get_full_name }}</strong></span>
+ <span>Last edited: <strong>{{ object.live_revision.timestamp.date }} by {{ object.live_revision.author }}</strong></span>
{% if request.user|has_edit_perm:object %}
<a class="link link--edit-submission is-active" href="{% url 'funds:submissions:edit' object.id %}">
Edit
--
GitLab