From 2bf0389e7be0285288709fc53aa0a22519223642 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Thu, 6 Aug 2015 11:08:02 +0800
Subject: [PATCH] =?UTF-8?q?announcement=20model.py=20=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=20description=20=E6=94=B9=E5=90=8D=E4=B8=BA=20content?=
 =?UTF-8?q?,=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=85=B6=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84serializers=E5=92=8Cviews?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0002_auto_20150806_1104.py     | 19 +++++++++++++++++++
 announcement/models.py                        |  4 ++--
 announcement/serializers.py                   |  2 +-
 announcement/views.py                         |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 announcement/migrations/0002_auto_20150806_1104.py

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: