From ae87a51277fdd38647f16598bc7a35d45ffbe676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= <v.gladkikh@spider.ru>
Date: Fri, 27 Sep 2019 17:10:08 +0300
Subject: [PATCH] Author

---
 apps/news/migrations/0016_remove_news_author.py | 17 +++++++++++++++++
 apps/news/models.py                             |  4 ++--
 apps/news/serializers.py                        |  3 ++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 apps/news/migrations/0016_remove_news_author.py

diff --git a/apps/news/migrations/0016_remove_news_author.py b/apps/news/migrations/0016_remove_news_author.py
new file mode 100644
index 00000000..31ad12bb
--- /dev/null
+++ b/apps/news/migrations/0016_remove_news_author.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.2.4 on 2019-09-27 13:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0015_auto_20190927_0853'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='news',
+            name='author',
+        ),
+    ]
diff --git a/apps/news/models.py b/apps/news/models.py
index 4fb8e118..545de59d 100644
--- a/apps/news/models.py
+++ b/apps/news/models.py
@@ -68,8 +68,8 @@ class News(BaseAttributes, TranslatedFieldsMixin):
     playlist = models.IntegerField(_('playlist'))
     is_publish = models.BooleanField(default=False,
                                      verbose_name=_('Publish status'))
-    author = models.CharField(max_length=255, blank=True, null=True,
-                              default=None,verbose_name=_('Author'))
+    # author = models.CharField(max_length=255, blank=True, null=True,
+    #                           default=None,verbose_name=_('Author'))
     is_highlighted = models.BooleanField(default=False,
                                          verbose_name=_('Is highlighted'))
     # TODO: metadata_keys - описание ключей для динамического построения полей метаданных
diff --git a/apps/news/serializers.py b/apps/news/serializers.py
index 3d15cff9..1778d410 100644
--- a/apps/news/serializers.py
+++ b/apps/news/serializers.py
@@ -5,7 +5,7 @@ from location.serializers import CountrySimpleSerializer
 from main.serializers import MetaDataContentSerializer
 from news import models
 from utils.serializers import TranslatedField
-
+from account.serializers.common import UserSerializer
 
 class NewsTypeSerializer(serializers.ModelSerializer):
     """News type serializer."""
@@ -50,6 +50,7 @@ class NewsDetailSerializer(NewsBaseSerializer):
 
     description_translated = TranslatedField()
     country = CountrySimpleSerializer(read_only=True)
+    author = UserSerializer(source='news_records_created')
 
     class Meta(NewsBaseSerializer.Meta):
         """Meta class."""