Merge develop into main

myblog/blog/migrations/0010_post_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1 on 2025-07-31 15:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0009_sitesettings_contact_email_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='post',
-            name='status',
-            field=models.CharField(choices=[('draft', '草稿'), ('published', '已发布')], default='draft', max_length=10),
-        ),
-    ]

myblog/blog/models.py

@@ -36,23 +36,13 @@ class SiteSettings(models.Model):
 
 
 class Post(models.Model):
-    # 添加状态选项
-    DRAFT = 'draft'
-    PUBLISHED = 'published'
-    STATUS_CHOICES = [
-        (DRAFT, '草稿'),
-        (PUBLISHED, '已发布'),
-    ]
-
     title = models.CharField(max_length=100)
-    content = MDTextField()
+    content = MDTextField()  # ✅ 改成这里
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     publish_date = models.DateTimeField(default=timezone.now)
     # 添加分类字段，建立外键关系
     category = models.ForeignKey(Category, on_delete=models.SET_NULL, null=True, blank=True, related_name='posts')
-    # 添加状态字段
-    status = models.CharField(max_length=10, choices=STATUS_CHOICES, default=DRAFT)
 
     def __str__(self):
         return f"{self.title}"

myblog/blog/templates/blog/contact.html

@@ -290,28 +290,28 @@
             
             <ul class="contact-details">
                 {% if site_settings.contact_email %}
-                    <li>
+                <li>
-                        <span class="contact-label">邮箱:</span>
+                    <span class="contact-label">邮箱:</span>
-                        <span class="contact-value">{{ site_settings.contact_email }}</span>
+                    <span class="contact-value">{{ site_settings.contact_email }}</span>
-                    </li>
+                </li>
                 {% endif %}
                 {% if site_settings.contact_wechat %}
-                    <li>
+                <li>
-                        <span class="contact-label">微信:</span>
+                    <span class="contact-label">微信:</span>
-                        <span class="contact-value">{{ site_settings.contact_wechat }}</span>
+                    <span class="contact-value">{{ site_settings.contact_wechat }}</span>
-                    </li>
+                </li>
                 {% endif %}
                 {% if site_settings.contact_linkedin %}
-                    <li>
+                <li>
-                        <span class="contact-label">LinkedIn:</span>
+                    <span class="contact-label">LinkedIn:</span>
-                        <span class="contact-value">{{ site_settings.contact_linkedin }}</span>
+                    <span class="contact-value">{{ site_settings.contact_linkedin }}</span>
-                    </li>
+                </li>
                 {% endif %}
                 {% if site_settings.contact_github %}
-                    <li>
+                <li>
-                        <span class="contact-label">GitHub:</span>
+                    <span class="contact-label">GitHub:</span>
-                        <span class="contact-value">{{ site_settings.contact_github }}</span>
+                    <span class="contact-value">{{ site_settings.contact_github }}</span>
-                    </li>
+                </li>
                 {% endif %}
             </ul>
         </div>

myblog/blog/templates/blog/rss.html

@@ -285,11 +285,10 @@
                     <div class="rss-feed-description">包含所有博客文章</div>
                 </li>
                 {% for category in categories %}
-                    <li>
+                <li>
-                        <a href="{% url 'category_feed' category.id %}" class="rss-feed-link"
+                    <a href="{% url 'category_feed' category.id %}" class="rss-feed-link" target="_blank">{{ category.name }}分类</a>
-                           target="_blank">{{ category.name }}分类</a>
+                    <div class="rss-feed-description">{{ category.name }}分类下的最新博客文章</div>
-                        <div class="rss-feed-description">{{ category.name }}分类下的最新博客文章</div>
+                </li>
-                    </li>
                 {% endfor %}
             </ul>
         </div>

myblog/blog/views.py

@@ -1,48 +1,6 @@
 from django.shortcuts import render, get_object_or_404
 from .models import Post, Category, SiteSettings
 
-def post_list(request):
-    # 只显示已发布的文章
-    posts = Post.objects.filter(status=Post.PUBLISHED).order_by('-publish_date')
-    categories = Category.objects.all()
-    
-    # 获取站点设置
-    site_settings = SiteSettings.objects.first()
-    summary_length = site_settings.summary_length if site_settings else 50
-    
-    return render(request, 'blog/post_list.html', {
-        'posts': posts,
-        'categories': categories,
-        'summary_length': summary_length
-    })
-
-def post_detail(request, pk):
-    # 只允许查看已发布的文章
-    post = get_object_or_404(Post, pk=pk, status=Post.PUBLISHED)
-    categories = Category.objects.all()
-    
-    return render(request, 'blog/post_detail.html', {
-        'post': post,
-        'categories': categories
-    })
-
-def category_posts(request, category_id):
-    category = get_object_or_404(Category, id=category_id)
-    # 只显示该分类下已发布的文章
-    posts = Post.objects.filter(category=category, status=Post.PUBLISHED).order_by('-publish_date')
-    categories = Category.objects.all()
-    
-    # 获取站点设置
-    site_settings = SiteSettings.objects.first()
-    summary_length = site_settings.summary_length if site_settings else 50
-    
-    return render(request, 'blog/post_list.html', {
-        'posts': posts,
-        'categories': categories,
-        'current_category': category,
-        'summary_length': summary_length
-    })
-
 
 # Create your views here.
 
@@ -71,21 +29,22 @@ def index(request):
     if query:
         # 根据搜索类型执行不同的搜索
         if search_type == 'title':
-            posts = Post.objects.filter(title__icontains=query, status=Post.PUBLISHED)
+            posts = Post.objects.filter(title__icontains=query)
         elif search_type == 'content':
-            posts = Post.objects.filter(content__icontains=query, status=Post.PUBLISHED)
+            posts = Post.objects.filter(content__icontains=query)
         else:
             # 默认按标题和内容搜索
-            posts = Post.objects.filter(title__icontains=query, status=Post.PUBLISHED) | Post.objects.filter(content__icontains=query, status=Post.PUBLISHED)
+            posts = Post.objects.filter(title__icontains=query) | Post.objects.filter(content__icontains=query)
     elif category_id:
-        posts = Post.objects.filter(category_id=category_id, status=Post.PUBLISHED)
+        posts = Post.objects.filter(category_id=category_id)
     else:
-        posts = Post.objects.filter(status=Post.PUBLISHED)
+        posts = Post.objects.all()
     
     posts = posts.order_by('-publish_date').distinct()
     
     # 为每篇文章添加摘要（根据设置的字符长度）
     for post in posts:
+        # 移除HTML标签并截取前N个字符作为摘要
         import re
         clean_content = re.sub(r'<[^>]+>', '', post.get_markdown_content())
         post.summary = clean_content[:summary_length] + '...' if len(clean_content) > summary_length else clean_content
@@ -101,16 +60,13 @@ def index(request):
 
 
 def detail(request, post_id):
-    post = get_object_or_404(Post, pk=post_id, status=Post.PUBLISHED)
+    post = get_object_or_404(Post, pk=post_id)
     categories = Category.objects.all()  # 获取所有分类用于侧边栏
     try:
         site_settings = SiteSettings.objects.first()
     except SiteSettings.DoesNotExist:
         site_settings = None
-    return render(request, 'blog/detail.html', {
+    return render(request, 'blog/detail.html', {'post': post, 'categories': categories, 'site_settings': site_settings})
-        'post': post,
-        'categories': categories,
-        'site_settings': site_settings})
 
 
 # 添加RSS页面视图

myblog/myblog/settings.py

@@ -163,3 +163,4 @@ try:
     from .local_settings import *
 except ImportError:
     pass
+