refactoring...

Author: yangxueguang

blog/context_processors.py

@@ -0,0 +1,13 @@
+from django.db.models.aggregates import Count
+from .models import Category, Article
+
+
+def sidebar(request):
+    category_list = Category.objects.filter(article__status='p').annotate(num_articles=Count('article')).filter(
+            num_articles__gt=0)
+    recent_articles = Article.objects.filter(status='p')[:5]
+
+    return {
+        'category_list': category_list,
+        'recent_articles': recent_articles,
+    }

blog/forms.py

@@ -1,22 +1,8 @@
 from django import forms
-from .models import Article, BlogComment
+from .models import Article, ArticleComment
 
 
-class BlogCommentForm(forms.ModelForm):
+class ArticleCommentForm(forms.ModelForm):
     class Meta:
-        model = BlogComment
+        model = ArticleComment
         fields = ['user_name', 'user_email', 'body']
-        widgets = {
-            # <input type="text" class="form-control" placeholder="Username" aria-describedby="sizing-addon1">
-            'user_name': forms.TextInput(attrs={
-                'class': 'form-control',
-                'placeholder': "请输入昵称",
-                'aria-describedby': "sizing-addon1",
-            }),
-            'user_email': forms.TextInput(attrs={
-                'class': 'form-control',
-                'placeholder': "请输入邮箱",
-                'aria-describedby': "sizing-addon1",
-            }),
-            'body': forms.Textarea(attrs={'placeholder': '我来评两句~'}),
-        }

blog/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-26 10:58
+# Generated by Django 1.9.6 on 2016-08-04 06:53
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,39 +12,64 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Article',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=70, verbose_name='标题')),
+                ('title', models.CharField(max_length=200, verbose_name='标题')),
                 ('body', models.TextField(verbose_name='正文')),
                 ('created_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('last_modified_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
-                ('status', models.CharField(choices=[('d', 'Draft'), ('p', 'Published')], max_length=1, verbose_name='文章状态')),
-                ('abstract', models.CharField(blank=True, help_text='可选，如若为空将摘取正文的前54个字符', max_length=54, null=True, verbose_name='摘要')),
+                ('last_mod_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
+                ('status', models.CharField(choices=[('d', '草稿'), ('p', '发表')], max_length=1, verbose_name='文章状态')),
+                ('abstract', models.CharField(blank=True, help_text='可选，若为空将摘取正文的前54个字符。', max_length=200, verbose_name='摘要')),
                 ('views', models.PositiveIntegerField(default=0, verbose_name='浏览量')),
-                ('likes', models.PositiveIntegerField(default=0, verbose_name='点赞数')),
-                ('topped', models.BooleanField(default=False, verbose_name='置顶')),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='作者')),
             ],
             options={
-                'ordering': ['-last_modified_time'],
+                'ordering': ['-created_time'],
             },
         ),
+        migrations.CreateModel(
+            name='ArticleComment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user_name', models.CharField(max_length=100, verbose_name='名字')),
+                ('user_email', models.EmailField(max_length=255, verbose_name='邮箱')),
+                ('body', models.TextField(verbose_name='评论内容')),
+                ('created_time', models.DateTimeField(auto_now_add=True, verbose_name='评论发表时间')),
+                ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='blog.Article', verbose_name='评论所属文章')),
+            ],
+        ),
         migrations.CreateModel(
             name='Category',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=20, verbose_name='类名')),
+                ('name', models.CharField(max_length=30, verbose_name='分类名')),
+                ('created_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('last_mod_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30, verbose_name='标签名')),
                 ('created_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
-                ('last_modified_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
+                ('last_mod_time', models.DateTimeField(auto_now=True, verbose_name='修改时间')),
             ],
         ),
         migrations.AddField(
             model_name='article',
             name='category',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='blog.Category', verbose_name='分类'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='blog.Category', verbose_name='分类'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='tags',
+            field=models.ManyToManyField(blank=True, to='blog.Tag', verbose_name='标签集合'),
         ),
     ]

blog/migrations/0002_auto_20160622_1848.py

@@ -1,77 +1,60 @@
 from django.db import models
 from django.core.urlresolvers import reverse
-from collections import defaultdict
-
-import datetime
-
-
-# Create your models here.
-class ArticleManage(models.Manager):
-    def archive(self):
-        date_list = Article.objects.datetimes('created_time', 'month', order='DESC')
-        date_dict = defaultdict(list)
-        for d in date_list:
-            date_dict[d.year].append(d.month)
-        return sorted(date_dict.items(), reverse=True)  # 模板不支持defaultdict
+from django.conf import settings
 
 
 class Article(models.Model):
     STATUS_CHOICES = (
-        ('d', 'Draft'),
-        ('p', 'Published'),
+        ('d', '草稿'),
+        ('p', '发表'),
     )
 
-    objects = ArticleManage()
-
-    title = models.CharField('标题', max_length=70)
+    title = models.CharField('标题', max_length=200)
     body = models.TextField('正文')
-    created_time = models.DateTimeField('创建时间')
-    last_modified_time = models.DateTimeField('修改时间')
+    created_time = models.DateTimeField('创建时间', auto_now_add=True)
+    last_mod_time = models.DateTimeField('修改时间', auto_now=True)
     status = models.CharField('文章状态', max_length=1, choices=STATUS_CHOICES)
-    abstract = models.CharField('摘要', max_length=54, blank=True, null=True, help_text="可选，如若为空将摘取正文的前54个字符")
+    abstract = models.CharField('摘要', max_length=200, blank=True, help_text="可选，若为空将摘取正文的前54个字符。")
     views = models.PositiveIntegerField('浏览量', default=0)
-    likes = models.PositiveIntegerField('点赞数', default=0)
-    topped = models.BooleanField('置顶', default=False)
+    author = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='作者', on_delete=models.CASCADE)
 
-    category = models.ForeignKey('Category', verbose_name='分类', null=True, on_delete=models.SET_NULL)
+    category = models.ForeignKey('Category', verbose_name='分类', on_delete=models.CASCADE)
     tags = models.ManyToManyField('Tag', verbose_name='标签集合', blank=True)
 
     def __str__(self):
         return self.title
 
     class Meta:
-        ordering = ['-last_modified_time']
+        ordering = ['-created_time']
 
-    # 第五周：新增 get_absolute_url 方法
     def get_absolute_url(self):
         return reverse('blog:detail', kwargs={'article_id': self.pk})
 
 
 class Category(models.Model):
-    name = models.CharField('类名', max_length=20)
+    name = models.CharField('分类名', max_length=30)
     created_time = models.DateTimeField('创建时间', auto_now_add=True)
-    last_modified_time = models.DateTimeField('修改时间', auto_now=True)
+    last_mod_time = models.DateTimeField('修改时间', auto_now=True)
 
     def __str__(self):
         return self.name
 
 
 class Tag(models.Model):
-    name = models.CharField('标签名', max_length=20)
+    name = models.CharField('标签名', max_length=30)
     created_time = models.DateTimeField('创建时间', auto_now_add=True)
-    last_modified_time = models.DateTimeField('修改时间', auto_now=True)
+    last_mod_time = models.DateTimeField('修改时间', auto_now=True)
 
     def __str__(self):
         return self.name
 
 
-# # 第五周：新增评论
-class BlogComment(models.Model):
-    user_name = models.CharField('评论者名字', max_length=100)
-    user_email = models.EmailField('评论者邮箱', max_length=255)
+class ArticleComment(models.Model):
+    user_name = models.CharField('名字', max_length=100)
+    user_email = models.EmailField('邮箱', max_length=255)
     body = models.TextField('评论内容')
     created_time = models.DateTimeField('评论发表时间', auto_now_add=True)
-    article = models.ForeignKey('Article', verbose_name='评论所属文章', on_delete=models.CASCADE)
+    article = models.ForeignKey('Article', verbose_name='评论所属文章', related_name='comments', on_delete=models.CASCADE)
 
     def __str__(self):
         return self.body[:20]