Store admin that sent a message

Author: stefano-maggiolo

cms/db/user.py

@@ -320,6 +320,18 @@ class Message(Base):
         Participation,
         back_populates="messages")
 
+    # Admin that sent the message (or null if the admin has been later
+    # deleted). Admins only loosely "own" a message, so we do not back
+    # populate any field in Admin, nor we delete the message when the admin
+    # gets deleted.
+    admin_id = Column(
+        Integer,
+        ForeignKey(Admin.id,
+                   onupdate="CASCADE", ondelete="SET NULL"),
+        nullable=True,
+        index=True)
+    admin = relationship(Admin)
+
 
 class Question(Base):
     """Class to store a private question from the user to the

cms/server/admin/handlers/contestuser.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2013 Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
-# Copyright © 2010-2015 Stefano Maggiolo <s.maggiolo@gmail.com>
+# Copyright © 2010-2018 Stefano Maggiolo <s.maggiolo@gmail.com>
 # Copyright © 2010-2012 Matteo Boscariol <boscarim@hotmail.com>
 # Copyright © 2012-2017 Luca Wehrstedt <luca.wehrstedt@gmail.com>
 # Copyright © 2014 Artem Iglikov <artem.iglikov@gmail.com>
@@ -268,7 +268,8 @@ def post(self, contest_id, user_id):
         message = Message(make_datetime(),
                           self.get_argument("message_subject", ""),
                           self.get_argument("message_text", ""),
-                          participation=participation)
+                          participation=participation,
+                          admin=self.current_user)
         self.sql_session.add(message)
         if self.try_commit():
             logger.info("Message submitted to user %s in contest %s.",

cms/server/admin/templates/participation.html

@@ -217,6 +217,10 @@ <h2 id="title_messages" class="toggling_on">Messages</h2>
           <div class="notification_timestamp">{{ msg.timestamp }}</div>
           <div class="notification_subject">{{ msg.subject }}</div>
           <div class="notification_text preserve_line_breaks">{{ msg.text }}</div>
+          <hr>
+          <div class="notification_admin_owner">
+            By: {{ msg.admin.name if msg.admin is not none else "<unknown>" }}
+          </div>
         </div>
       </div>
       {% endfor %}