Store admin that made an announcement

Author: stefano-maggiolo

cms/db/__init__.py

@@ -102,8 +102,8 @@
     FilenameSchemaArray, Digest
 from .base import Base
 from .fsobject import FSObject, LargeObject
-from .contest import Contest, Announcement
 from .admin import Admin
+from .contest import Contest, Announcement
 from .user import User, Team, Participation, Message, Question
 from .task import Task, Statement, Attachment, Dataset, Manager, Testcase
 from .submission import Submission, File, Token, SubmissionResult, \

cms/db/contest.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2012 Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
-# Copyright © 2010-2016 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-2018 Luca Wehrstedt <luca.wehrstedt@gmail.com>
 # Copyright © 2013 Bernard Blackham <bernard@largestprime.net>
@@ -45,7 +45,7 @@
 
 from cms import TOKEN_MODE_DISABLED, TOKEN_MODE_FINITE, TOKEN_MODE_INFINITE
 
-from . import Codename, Base
+from . import Codename, Base, Admin
 
 
 class Contest(Base):
@@ -342,3 +342,15 @@ class Announcement(Base):
     contest = relationship(
         Contest,
         back_populates="announcements")
+
+    # Admin that created the announcement (or null if the admin has been
+    # later deleted). Admins only loosely "own" an announcement, so we do not
+    # back populate any field in Admin, nor delete the announcement if the
+    # admin gets deleted.
+    admin_id = Column(
+        Integer,
+        ForeignKey(Admin.id,
+                   onupdate="CASCADE", ondelete="SET NULL"),
+        nullable=True,
+        index=True)
+    admin = relationship(Admin)

cms/server/admin/handlers/contestannouncement.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-2014 Luca Wehrstedt <luca.wehrstedt@gmail.com>
 # Copyright © 2014 Artem Iglikov <artem.iglikov@gmail.com>
@@ -54,7 +54,7 @@ def post(self, contest_id):
         text = self.get_argument("text", "")
         if len(subject) > 0:
             ann = Announcement(make_datetime(), subject, text,
-                               contest=self.contest)
+                               contest=self.contest, admin=self.current_user)
             self.sql_session.add(ann)
             self.try_commit()
         else:

cms/server/admin/templates/announcements.html

@@ -43,6 +43,10 @@ <h2 id="title_announcements" class="toggling_on">Announcements</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>