From ac49e352a39e1da54a72e6224aeb56070e74db3f Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 23 Jul 2018 15:36:43 +0100
Subject: [PATCH] remove the superfluous kwarg (new is submission)
---
opentech/apply/activity/messaging.py | 2 +-
opentech/apply/funds/views.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 512f3ea6c..0e854a583 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -21,7 +21,7 @@ class MessageAdapter:
class ActivityAdapter:
messages = {
MESSAGES.NEW_SUBMISSION: 'Submitted {submission.title} for {submission.page.title}',
- MESSAGES.UPDATE_LEAD: 'Lead changed from {old.lead} to {new.lead}',
+ MESSAGES.UPDATE_LEAD: 'Lead changed from {old.lead} to {submission.lead}',
MESSAGES.NEW_DETERMINATION: 'Created a determination for {submission.title}',
MESSAGES.DETERMINATION_OUTCOME: 'Sent a {submission.determination.get_outcome_display} determination for {submission.title}:\r\n{determination.clean_message}',
MESSAGES.INVITED_TO_PROPOSAL: '{submission.title} has been invited to submit a proposal.',
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 554e39c34..07eff4186 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -98,13 +98,11 @@ class UpdateLeadView(DelegatedViewMixin, UpdateView):
# Fetch the old lead from the database
old = copy(self.get_object())
response = super().form_valid(form)
- new = form.instance
messenger(
MESSAGES.UPDATE_LEAD,
user=self.request.user,
- submission=self.kwargs['submission'],
+ submission=form.instance,
old=old,
- new=new,
)
return response
--
GitLab