TODO.md

@@ -1,9 +0,0 @@
-# News
-
-TODO: Add the header image into the news item list view.
-TODO: Add the header image into the news item detail view.
-TODO: Add the origin text into the news item list view.
-TODO: Add the origin text into the news item detail view.
-TODO: Create a RedirectView for the origin link.
-TODO: On clicking the origin link, add one to the origin followed count.
-

news/migrations/0002_newsitem_origin_text_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.2.8 on 2025-11-10 19:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("news", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="newsitem",
-            name="origin_text",
-            field=models.CharField(blank=True, max_length=200, null=True),
-        ),
-        migrations.AlterField(
-            model_name="newsitem",
-            name="origin_times_followed",
-            field=models.PositiveIntegerField(default=0),
-        ),
-    ]

news/models.py

@@ -33,9 +33,8 @@ class NewsItem(models.Model):
         Category, on_delete=models.PROTECT, related_name="news_items"
     )
     body = MarkdownxField()
-    origin_text = models.CharField(max_length=200, blank=True, null=True)
     origin_link = models.URLField(blank=True, null=True)
-    origin_times_followed = models.PositiveIntegerField(default=0)
+    origin_times_followed = models.PositiveIntegerField()
     header_img = models.ImageField(blank=True, null=True)
     tags = TagField(
         force_lowercase=True,

news/templates/news/newsitem_list.html

@@ -5,6 +5,11 @@
         {% if object_list %}
             {% if category %}
                 <h3>{{ category }} News</h3>
+                <!-- {% if category.introduction %} -->
+                    <!-- <div> -->
+                        <!-- <p>{{ category.introduction }}</p> -->
+                    <!-- </div> -->
+                <!-- {% endif %} -->
             {% elif tag %}
                 <h3>News for tag: {{ tag }}</h3>
             {% else %}
@@ -12,16 +17,14 @@
             {% endif %}
             <hr>
             <div>
-                {% for newsitem in object_list %}
+                {% for news in object_list %}
                     <div>
-                        <a href="{{ newsitem.get_absolute_url }}">{{ newsitem.title }}</a>
+                        <a href="{{ news.get_absolute_url }}">{{ news.title }}</a>
-                        <hr>
-                        {{ newsitem.body_as_markdown|safe }}
                         <hr >
                         <div>
                             <span>
-                                <a href="{% url 'news:list_category' category=newsitem.category.slug %}">{{ newsitem.category }} </a>
+                                <a href="{% url 'news:list_category' category=news.category.slug %}">{{ news.category }} </a>
-                                &bull; {{ newsitem.created_at | date:'jS \o\f F, Y' }}
+                                &bull; {{ news.created | date:'jS \o\f F, Y' }}
                             </span>
                             <span>{% include 'news/includes/display_tags.html' %}</span>
                         </div>