From 9eb01b3355af962a3ee6d9780a7845d0b7227ba9 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 16 Sep 2020 10:45:35 +0200 Subject: [PATCH] Fix reject message subject on two-moderator items Two-moderator items require only one moderator to be rejected or to be sent back for more editing. In that case, don't log None as the other moderator. --- pgweb/core/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pgweb/core/views.py b/pgweb/core/views.py index 3f3be58b..5ab4cb3f 100644 --- a/pgweb/core/views.py +++ b/pgweb/core/views.py @@ -326,7 +326,9 @@ def _send_moderation_message(request, obj, message, notice, what): # No point in sending an edit link to a page that doesn't exist anymore admmsg += "\n\nEdit at: {}/admin/_moderate/{}/{}/\n".format(settings.SITE_ROOT, obj._meta.model_name, obj.id) - if obj.twomoderators: + if obj.twomoderators and obj.firstmoderator: + # For two-moderator objects, only one is required to reject or send back for editing. In that case, + # just log the current user who is the one that did that. modname = "{} and {}".format(obj.firstmoderator, request.user) else: modname = request.user -- 2.39.5