Merge branch 'Forum' into 'master'

Forum

See merge request !5

widget_group22/forum/migrations/0006_alter_post_author_alter_reply_author.py

+# Generated by Django 4.0.3 on 2022-04-05 15:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0006_widgetuser_department'),
+        ('forum', '0005_reply_author'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='author',
+            field=models.ForeignKey(default='Anonymous', null=True, on_delete=django.db.models.deletion.CASCADE, to='homepage.widgetuser'),
+        ),
+        migrations.AlterField(
+            model_name='reply',
+            name='author',
+            field=models.ForeignKey(default='Anonymous', null=True, on_delete=django.db.models.deletion.CASCADE, to='homepage.widgetuser'),
+        ),
+    ]

widget_group22/forum/views.py

@@ -13,8 +13,11 @@ def displayForumPosts(request):
         P_body = Post.post_body
         P_pub_date = Post.pub_date
 
-        PostThread = ("<br><font size='+1'> Post (" + P_title + ") by " + str(Post.author) + " dated " + str(P_pub_date) + ": <br>" + P_body + "</font>")
-        output += PostThread + "<br>"
+        PostThread = (
+                      "<br><font size='+1.5'> '<b>" + P_title + "</b>' by <i>" + str(Post.author.first_name) + " " + 
+                      str(Post.author.last_name) + "</i> dated " + str(P_pub_date) + ": <br>" + P_body + "</font>"
+                     )
+        output += PostThread + ""
 
         for Reply in ForumReplies:
             ReplytoPost = Reply.post.post_title
@@ -23,7 +26,9 @@ def displayForumPosts(request):
 
             if ReplytoPost == P_title and R_body != NULL:
                 ReplyThread = (
-                              "<br>                   Reply to (" + ReplytoPost + ") by " + str(Reply.author) + " dated " + str(R_pub_date) + ": <br>" +
-                              R_body   )
-                output += ReplyThread + "<br>"
+                              "<br> Reply by <i>" + str(Reply.author.first_name) + " " + str(Reply.author.last_name) + 
+                              "</i> dated " + str(R_pub_date) + ": <br>" + R_body   
+                              )
+                output += ReplyThread + ""
+        output += "<br>"
     return HttpResponse('<h1>FORUM POSTS: </h1>' + output )
\ No newline at end of file