Add latest interacting admin to user question schema, and show it in AWS

Author: stefano-maggiolo

cms/db/__init__.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-2017 Stefano Maggiolo <s.maggiolo@gmail.com>
+# Copyright © 2010-2018 Stefano Maggiolo <s.maggiolo@gmail.com>
 # Copyright © 2010-2012 Matteo Boscariol <boscarim@hotmail.com>
 # Copyright © 2013 Bernard Blackham <bernard@largestprime.net>
 # Copyright © 2013-2018 Luca Wehrstedt <luca.wehrstedt@gmail.com>
@@ -103,8 +103,8 @@
 from .base import Base
 from .fsobject import FSObject, LargeObject
 from .contest import Contest, Announcement
-from .user import User, Team, Participation, Message, Question
 from .admin import Admin
+from .user import User, Team, Participation, Message, Question
 from .task import Task, Statement, Attachment, Dataset, Manager, Testcase
 from .submission import Submission, File, Token, SubmissionResult, \
     Executable, Evaluation
@@ -148,4 +148,5 @@ def get_submission_results_for_dataset(self, dataset):
         .options(subqueryload(SubmissionResult.evaluations))\
         .all()
 
+
 Dataset.get_submission_results = get_submission_results_for_dataset

cms/db/user.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-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-2018 Luca Wehrstedt <luca.wehrstedt@gmail.com>
 # Copyright © 2015 William Di Luigi <williamdiluigi@gmail.com>
@@ -44,7 +44,7 @@
 
 from cmscommon.crypto import generate_random_password, build_password
 
-from . import CastingArray, Codename, Base, Contest
+from . import CastingArray, Codename, Base, Admin, Contest
 
 
 class User(Base):
@@ -379,3 +379,15 @@ class Question(Base):
     participation = relationship(
         Participation,
         back_populates="questions")
+
+    # Latest admin to interact with the question (null if no interactions
+    # yet, or if the admin has been later deleted). Admins only loosely "own" a
+    # question, so we do not back populate any field in Admin, nor delete the
+    # question 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/contestquestion.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>
@@ -99,6 +99,7 @@ def post(self, contest_id, question_id):
             question.reply_text = ""
 
         question.reply_timestamp = make_datetime()
+        question.admin = self.current_user
 
         if self.try_commit():
             logger.info("Reply sent to user %s in contest %s for "
@@ -129,6 +130,7 @@ def post(self, contest_id, question_id):
 
         # Commit the change.
         question.ignored = should_ignore
+        question.admin = self.current_user
         if self.try_commit():
             logger.info("Question '%s' by user %s in contest %s has "
                         "been %s",

cms/server/admin/static/aws_style.css

@@ -625,6 +625,10 @@ body.admin .notifications .ignore_reply {
     padding-right: 0.5em;
 }
 
+body.admin .notifications .notification_admin_owner {
+    font-style: italic;
+}
+
 body.admin .notifications .notification_close {
     background-color: #E475FF;
     border-left: 0.143em solid #E475FF;

cms/server/admin/templates/questions.html

@@ -51,10 +51,20 @@ <h1>Questions</h1>
       <div class="notification_subject">{{ msg.subject }}</div>
       <div class="notification_text preserve_line_breaks">{{ msg.text }}</div>
       {% if msg.reply_timestamp is not none %}
+      <hr>
       <div class="notification_subject">Reply: {{ msg.reply_subject }}</div>
       <div class="notification_text preserve_line_breaks">{{ msg.reply_text }}</div>
+      <hr>
+      <div class="notification_admin_owner">
+        Reply from: {{ msg.admin.name if msg.admin is not none else "<unknown>" }}</div>
       {% else %}
+      <hr>
       <div class="notification_subject">Not yet replied.</div>
+      <hr>
+        {% if not msg.admin is none and msg.ignored %}
+      <div class="notification_admin_owner">
+        Ignored by: {{ msg.admin is none and "<deleted>" or msg.admin.name }}</div>
+        {% endif %}
       {% endif %}
 {% if admin.permission_all or admin.permission_messaging %}
       {% if msg.reply_timestamp is none %}