Fix reject message subject on two-moderator items
authorMagnus Hagander <magnus@hagander.net>
Wed, 16 Sep 2020 08:45:35 +0000 (10:45 +0200)
committerMagnus Hagander <magnus@hagander.net>
Wed, 16 Sep 2020 17:59:18 +0000 (19:59 +0200)
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

index 3f3be58b59df9f33a7697c5163933954ac9b39b0..5ab4cb3f19e8df44b66b68279f28614fb12a5cd6 100644 (file)
@@ -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