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}}
{{ form.content_type.errors }} - {{ form.content_type }}
{{ form.object_id.errors }} - {{ form.object_id }}
@@ -34,7 +32,7 @@ User: {{user}}
{{ form.note.errors }} - +
{{ form.note }}
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}}, {% endfor %}

Checked by: {% for verified in question.verified.all %} {{verified}}, {% endfor %}

- {% comment %}

Scrapped: {{ question.scrapped }} (toggle)

{% endcomment %} + {% comment %}

Scrapped: {{ question.scrapped }} (toggle)

{% endcomment %}

Answers (score): {% for answer in question.answers.all %} {% for note in question.anon_notes.all %}

  • - {{ 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 %} (Mark complete) {% endif %}