From 2c772d5f2c5e8e33150712025bc619c554e5d5b2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 9 Sep 2021 17:28:03 +0100
Subject: [PATCH] .

---
 .../migrations/0014_alter_questionnote_note.py | 18 ++++++++++++++++++
 generic/models.py                              |  2 +-
 .../templates/generic/questionnote_form.html   |  4 +---
 .../rapids/question_display_block.html         | 11 +++++++++--
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 generic/migrations/0014_alter_questionnote_note.py

diff --git a/generic/migrations/0014_alter_questionnote_note.py b/generic/migrations/0014_alter_questionnote_note.py
new file mode 100644
index 00000000..2ce44642
--- /dev/null
+++ b/generic/migrations/0014_alter_questionnote_note.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-09-09 16:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0013_questionnote_user_author'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='questionnote',
+            name='note',
+            field=models.TextField(blank=True),
+        ),
+    ]
diff --git a/generic/models.py b/generic/models.py
index 6beaf24c..99802dcc 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -128,7 +128,7 @@ class QuestionNote(models.Model):
     user_author = models.ForeignKey( settings.AUTH_USER_MODEL,
                                on_delete=models.CASCADE, blank=True, null=True)
 
-    note = models.TextField()
+    note = models.TextField(blank=True)
     created_on = models.DateTimeField(auto_now_add=True)
 
     complete = models.BooleanField(default=False)
diff --git a/generic/templates/generic/questionnote_form.html b/generic/templates/generic/questionnote_form.html
index 64de7a8f..024aa34d 100755
--- a/generic/templates/generic/questionnote_form.html
+++ b/generic/templates/generic/questionnote_form.html
@@ -19,12 +19,10 @@ User: {{user}}
 
 <div class="fieldWrapper">
     {{ form.content_type.errors }}
-    <label for="{{ form.content_type.id_for_label }}">Content Type</label>
     {{ form.content_type }}
 </div>
 <div class="fieldWrapper">
     {{ form.object_id.errors }}
-    <label for="{{ form.object_id.id_for_label }}">Object id</label>
     {{ form.object_id }}
 </div>
 <div class="fieldWrapper">
@@ -34,7 +32,7 @@ User: {{user}}
 </div>
 <div class="fieldWrapper">
     {{ form.note.errors }}
-    <label for="{{ form.note.id_for_label }}">Note</label>
+    <label for="{{ form.note.id_for_label }}">Additional information</label><br/>
     {{ form.note }}
 </div>
     <input type="submit" value="Submit">
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 511a47cb..56a0a29e 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -44,7 +44,8 @@
             href="{% url 'rapids:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
     <p><b>Checked by:</b> {% for verified in question.verified.all %} <a
             href="{% url 'rapids:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p>
-    {% comment %} <p><b>Scrapped:</b> {{ question.scrapped }} <a href="{% url 'rapids:rapid_scrap' pk=question.pk %}">(toggle)</a></p> {% endcomment %}
+    {% comment %} <p><b>Scrapped:</b> {{ question.scrapped }} <a
+            href="{% url 'rapids:rapid_scrap' pk=question.pk %}">(toggle)</a></p> {% endcomment %}
     <p class="pre-whitespace">
         Answers (score): {% for answer in question.answers.all %}
         <span {% if answer.proposed %}class="proposed-answer" data-aid="{{answer.pk}}" data-question-type="rapid"
@@ -69,7 +70,13 @@
     <ul class="notes">
         {% for note in question.anon_notes.all %}
         <li {% if note.complete %}class='complete' {% endif %}>
-            {{ note.created_on }} by {{ note.author }}: {{note.note_type}} / {{ note.note }}
+            {{ note.created_on }} by
+            {% if note.user_author %}
+            {{note.user_author}}
+            {% else %}
+            {{ note.author }} (unregistered):
+            {% endif %}
+            {{note.note_type}} / {{ note.note }}
             {% if not note.complete %}
             (<a href="{% url 'feedback_mark_complete' pk=note.pk %}">Mark complete</a>)
             {% endif %}