diff --git a/announcement/migrations/0002_auto_20150806_1104.py b/announcement/migrations/0002_auto_20150806_1104.py new file mode 100644 index 0000000..2768cc6 --- /dev/null +++ b/announcement/migrations/0002_auto_20150806_1104.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('announcement', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='announcement', + old_name='description', + new_name='content', + ), + ] diff --git a/announcement/models.py b/announcement/models.py index a47eba6..a3574b8 100644 --- a/announcement/models.py +++ b/announcement/models.py @@ -7,8 +7,8 @@ from account.models import User class Announcement(models.Model): # 标题 title = models.CharField(max_length=50) - # 公告的描述 HTML 格式 - description = models.TextField() + # 公告的内容 HTML 格式 + content = models.TextField() # 创建时间 create_time = models.DateTimeField(auto_now_add=True) # 这个公告是谁创建的 diff --git a/announcement/serializers.py b/announcement/serializers.py index a1525b9..3878e14 100644 --- a/announcement/serializers.py +++ b/announcement/serializers.py @@ -4,5 +4,5 @@ from rest_framework import serializers class AnnouncementSerializer(serializers.Serializer): title = serializers.CharField(max_length=50) - description = serializers.CharField(max_length=10000) + content = serializers.CharField(max_length=10000) diff --git a/announcement/views.py b/announcement/views.py index 220e806..e3766e8 100644 --- a/announcement/views.py +++ b/announcement/views.py @@ -21,7 +21,7 @@ class AnnouncementAPIView(APIView): if serializer.is_valid(): data = serializer.data Announcement.objects.create(title=data["title"], - description=data["description"], + content=data["content"], created_by=request.user) return success_response(u"公告发布成功!") else: