From 15ef2295caeebc9ebde351110a232cc8198c1b4f Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 7 Oct 2019 09:55:24 +0300 Subject: [PATCH] migration fix --- .../migrations/0014_auto_20190926_1156.py | 21 ------------------- apps/news/migrations/0015_newsgallery.py | 1 - apps/news/models.py | 4 ++++ .../migrations/0003_merge_20191004_1401.py | 14 ------------- 4 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 apps/news/migrations/0014_auto_20190926_1156.py delete mode 100644 apps/rating/migrations/0003_merge_20191004_1401.py diff --git a/apps/news/migrations/0014_auto_20190926_1156.py b/apps/news/migrations/0014_auto_20190926_1156.py deleted file mode 100644 index d16f0ad3..00000000 --- a/apps/news/migrations/0014_auto_20190926_1156.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.4 on 2019-09-26 11:56 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0013_auto_20190924_0806'), - ] - - operations = [ - migrations.RemoveField( - model_name='news', - name='image_url', - ), - migrations.RemoveField( - model_name='news', - name='preview_image_url', - ), - ] diff --git a/apps/news/migrations/0015_newsgallery.py b/apps/news/migrations/0015_newsgallery.py index a8422dab..8f81b4f8 100644 --- a/apps/news/migrations/0015_newsgallery.py +++ b/apps/news/migrations/0015_newsgallery.py @@ -8,7 +8,6 @@ class Migration(migrations.Migration): dependencies = [ ('gallery', '0002_auto_20190930_0714'), - ('news', '0014_auto_20190926_1156'), ] operations = [ diff --git a/apps/news/models.py b/apps/news/models.py index a87a34b4..4081a3a2 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -122,6 +122,10 @@ class News(BaseAttributes, TranslatedFieldsMixin): verbose_name=_('Is highlighted')) # TODO: metadata_keys - описание ключей для динамического построения полей метаданных # TODO: metadata_values - Описание значений для динамических полей из MetadataKeys + image_url = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Image URL path')) + preview_image_url = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Preview image URL path')) template = models.PositiveIntegerField(choices=TEMPLATE_CHOICES, default=NEWSPAPER) address = models.ForeignKey('location.Address', blank=True, null=True, default=None, verbose_name=_('address'), diff --git a/apps/rating/migrations/0003_merge_20191004_1401.py b/apps/rating/migrations/0003_merge_20191004_1401.py deleted file mode 100644 index f04cc893..00000000 --- a/apps/rating/migrations/0003_merge_20191004_1401.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.4 on 2019-10-04 14:01 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rating', '0002_auto_20191004_1217'), - ('rating', '0002_auto_20191004_0928'), - ] - - operations = [ - ]