From d7d5b105d1489fc9db1bf51bcf7ec9aa320911f7 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Fri, 18 Sep 2020 11:13:36 +0200
Subject: [PATCH] Improve moderation messages somewhat

Change the subject to use the title of the object instead of the id, and
include a link to the moderation page. There's surely more to be done,
but this is a decent start.
---
 pgweb/account/views.py | 9 +++++----
 pgweb/core/views.py    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pgweb/account/views.py b/pgweb/account/views.py
index fb3b3ba1..ec98d0ec 100644
--- a/pgweb/account/views.py
+++ b/pgweb/account/views.py
@@ -312,12 +312,13 @@ def _submitted_item_submit(request, objtype, model, obj):
 
                 send_simple_mail(settings.NOTIFICATION_FROM,
                                  settings.NOTIFICATION_EMAIL,
-                                 "{} {} submitted".format(obj._meta.verbose_name.capitalize(), obj.id),
-                                 "{} {} with title '{}' submitted for moderation by {}".format(
+                                 "{} '{}' submitted for moderation".format(obj._meta.verbose_name.capitalize(), obj.title),
+                                 "{} {} with title '{}' submitted for moderation by {}\n\nModerate at: {}\n".format(
                                      obj._meta.verbose_name.capitalize(),
                                      obj.id,
                                      obj.title,
-                                     request.user.username
+                                     request.user.username,
+                                     '{}/admin/_moderate/{}/{}/'.format(settings.SITE_ROOT, obj._meta.model_name, obj.pk),
                                  ),
                                  )
                 return HttpResponseRedirect("/account/edit/{}/".format(objtype))
@@ -348,7 +349,7 @@ def _submitted_item_withdraw(request, objtype, model, obj):
     send_simple_mail(
         settings.NOTIFICATION_FROM,
         settings.NOTIFICATION_EMAIL,
-        "{} {} withdrawn from moderation".format(model._meta.verbose_name.capitalize(), obj.id),
+        "{} '{}' withdrawn from moderation".format(model._meta.verbose_name.capitalize(), obj.title),
         "{} {} with title {} withdrawn from moderation by {}".format(
             model._meta.verbose_name.capitalize(),
             obj.id,
diff --git a/pgweb/core/views.py b/pgweb/core/views.py
index 78bb4959..b5b93151 100644
--- a/pgweb/core/views.py
+++ b/pgweb/core/views.py
@@ -378,7 +378,7 @@ def _send_moderation_message(request, obj, message, notice, what):
 
         send_simple_mail(settings.NOTIFICATION_FROM,
                          settings.NOTIFICATION_EMAIL,
-                         "{} {} by {}".format(obj._meta.verbose_name.capitalize(), what, modname),
+                         "{} '{}' {} by {}".format(obj._meta.verbose_name.capitalize(), obj.title, what, modname),
                          admmsg)