From c6531427185196dcfdeb8c34998f807b4032b223 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 19 Mar 2018 09:59:22 +0000
Subject: [PATCH] Make sure we actually output reviewer updates
---
opentech/apply/funds/views.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index e507b84a3..e0926ce37 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -109,20 +109,20 @@ class UpdateReviewersView(DelegatedViewMixin, UpdateView):
context_name = 'reviewer_form'
def form_valid(self, form):
- old_reviewers = self.get_object().reviewers.all()
+ old_reviewers = set(self.get_object().reviewers.all())
response = super().form_valid(form)
- new_reviewers = form.instance.reviewers.all()
+ new_reviewers = set(form.instance.reviewers.all())
message = ['Reviewers updated.']
- added = set(new_reviewers) - set(old_reviewers)
+ added = new_reviewers - old_reviewers
if added:
message.append('Added:')
- message.append(', '.join(added))
+ message.append(', '.join([str(user) for user in added]) + '.')
- removed = set(old_reviewers) - set(new_reviewers)
+ removed = old_reviewers - new_reviewers
if removed:
message.append('Removed:')
- message.append(', '.join(removed))
+ message.append(', '.join([str(user) for user in removed]) + '.')
Activity.actions.create(
user=self.request.user,
--
GitLab