Merge pull request #76 from skirsdeda/develop

Some more fixes to 1.7 migrations
This commit is contained in:
Iacopo Spalletti 2015-02-26 23:28:11 +01:00
commit d756edb1bf
2 changed files with 31 additions and 4 deletions

View file

@ -112,10 +112,10 @@ class Migration(migrations.Migration):
('title', models.CharField(max_length=255, verbose_name='Title')), ('title', models.CharField(max_length=255, verbose_name='Title')),
('slug', models.SlugField(verbose_name='slug', blank=True)), ('slug', models.SlugField(verbose_name='slug', blank=True)),
('abstract', djangocms_text_ckeditor.fields.HTMLField(verbose_name='Abstract')), ('abstract', djangocms_text_ckeditor.fields.HTMLField(verbose_name='Abstract')),
('meta_description', models.TextField(default=b'', verbose_name='Post meta description', blank=True)), ('meta_description', models.TextField(default='', verbose_name='Post meta description', blank=True)),
('meta_keywords', models.TextField(default=b'', verbose_name='Post meta keywords', blank=True)), ('meta_keywords', models.TextField(default='', verbose_name='Post meta keywords', blank=True)),
('meta_title', models.CharField(default=b'', help_text='used in title tag and social sharing', max_length=255, verbose_name='Post meta title', blank=True)), ('meta_title', models.CharField(default='', help_text='used in title tag and social sharing', max_length=255, verbose_name='Post meta title', blank=True)),
('post_text', djangocms_text_ckeditor.fields.HTMLField(default=b'', verbose_name='Text', blank=True)), ('post_text', djangocms_text_ckeditor.fields.HTMLField(default='', verbose_name='Text', blank=True)),
('master', models.ForeignKey(related_name='translations', editable=False, to='djangocms_blog.Post', null=True)), ('master', models.ForeignKey(related_name='translations', editable=False, to='djangocms_blog.Post', null=True)),
], ],
options={ options={

View file

@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import cms.models.fields
class Migration(migrations.Migration):
dependencies = [
('djangocms_blog', '0004_auto_20150108_1435'),
]
operations = [
migrations.AlterField(
model_name='post',
name='content',
field=cms.models.fields.PlaceholderField(slotname='post_content', to='cms.Placeholder', null=True, related_name='post_content', editable=False),
preserve_default=True,
),
migrations.AlterField(
model_name='post',
name='enable_comments',
field=models.BooleanField(default=False, verbose_name='Enable comments on post'),
preserve_default=True,
),
]