From aab3566d734356703be68ce71354ba261d434d62 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 9 Sep 2021 17:52:41 +0100
Subject: [PATCH] .

---
 generic/models.py                                   | 2 +-
 rapids/templates/rapids/question_display_block.html | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/generic/models.py b/generic/models.py
index 99802dcc..e265e8cd 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -140,7 +140,7 @@ class QuestionNote(models.Model):
     #    return reverse('rapids:question_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return "{} [{}] {} / {}".format(self.author, self.created_on, self.note_type, self.note)
+        return "{}: {} [{}] {} / {}".format(self.content_type, self.author, self.created_on, self.note_type, self.note)
 
     def get_absolute_url(self):
         return "/"
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 9aef4fbd..4eb7c195 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -70,12 +70,11 @@
     <ul class="notes">
         {% for note in question.anon_notes.all %}
         <li {% if note.complete %}class='complete' {% endif %}>
-            {{note.user_author}}
             {{ note.created_on }} by
             {% if note.user_author %}
             {{note.user_author}}
             {% else %}
-            {{ note.author }} (unregistered) [{{ note.user_author }}]:
+            {{ note.author }} [unregistered]
             {% endif %}
             {{note.note_type}} / {{ note.note }}
             {% if not note.complete %}