diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py index 53ea4608550ebb0c2d4747f3765b4eb18d6b7388..2c58f5edbb3da19238d14b9a92bd4f3f77b2b1b2 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 b37da93f9f17b57b3a04fd942546b52ea64d0c19..1e8b7798b9e288d00b2ab967f6daf12b0ca95ecc 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