SIO-1367 Allow admin to see author of the question even if it's alrea…

…dy been replied Change-Id: I306101ebd7bee015a55bcf91bcc444579ce52cf4
gkju · Jun 13, 2017 · ea1dcf1 · ea1dcf1
1 parent aa0fd01
commit ea1dcf1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/oioioi/questions/templates/questions/list_table.html b/oioioi/questions/templates/questions/list_table.html
@@ -23,7 +23,15 @@
             {% with record.message as msg %}
             {% url 'message' contest_id=contest.id message_id=record.link_message.id as link %}
             <tr class="{% if record.needs_reply %}danger{% elif is_admin and msg.kind == 'PUBLIC' %}info{% endif %}">
-                {% if not hide_author %}<td>{% full_name msg.author %}</td>{% endif %}
+                {% if not hide_author %}
+                    <td>
+                        {% if is_admin and msg.top_reference %}
+                            {% full_name msg.top_reference.author %}
+                        {% else %}
+                            {% full_name msg.author %}
+                        {% endif %}
+                    </td>
+                {% endif %}
                 {% if is_admin %}
                     <td><a href="{{ link }}">{{ msg.date }}</a></td>
                     <td>{% if msg.pub_date %}<a href="{{ link }}">{{ msg.pub_date }}</a>{% endif %}</td>

diff --git a/oioioi/questions/tests.py b/oioioi/questions/tests.py
@@ -379,6 +379,23 @@ def test_filtering(self):
         self.assertNotIn('public-answer', response.content)
         self.assertIn('private-answer', response.content)
 
+    def test_author_column(self):
+        contest = Contest.objects.get()
+        url = reverse('contest_messages',
+                      kwargs={'contest_id': contest.id})
+
+        self.client.login(username='test_admin')
+        response = self.client.get(url)
+        self.assertEquals(200, response.status_code)
+        self.assertContains(response, 'Test Admin', 3)
+        self.assertContains(response, 'Test User', 3)
+
+        self.client.login(username='test_user')
+        response = self.client.get(url)
+        self.assertEquals(200, response.status_code)
+        self.assertContains(response, 'Test Admin', 5)
+        self.assertContains(response, 'Test User', 1)
+
     def test_authors_list(self):
         self.client.login(username='test_admin')
         contest = Contest.objects.get()