Merge pull request #331 from nephila/feature/cleanup_migrations

Cleanup templateset migrations
This commit is contained in:
Iacopo Spalletti 2016-09-19 13:22:20 +02:00 committed by GitHub
commit 6bf6bdc159
2 changed files with 7 additions and 33 deletions

View file

@ -3,6 +3,10 @@ from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
from djangocms_blog.settings import get_setting
BLOG_PLUGIN_TEMPLATE_FOLDERS = get_setting('PLUGIN_TEMPLATE_FOLDERS')
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -14,16 +18,16 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='authorentriesplugin', model_name='authorentriesplugin',
name='template_folder', name='template_folder',
field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]), field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
), ),
migrations.AddField( migrations.AddField(
model_name='genericblogplugin', model_name='genericblogplugin',
name='template_folder', name='template_folder',
field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]), field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
), ),
migrations.AddField( migrations.AddField(
model_name='latestpostsplugin', model_name='latestpostsplugin',
name='template_folder', name='template_folder',
field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]), field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
), ),
] ]

View file

@ -1,30 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.9 on 2016-09-16 23:23
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('djangocms_blog', '0026_merge'),
]
operations = [
migrations.AlterField(
model_name='authorentriesplugin',
name='template_folder',
field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
),
migrations.AlterField(
model_name='genericblogplugin',
name='template_folder',
field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
),
migrations.AlterField(
model_name='latestpostsplugin',
name='template_folder',
field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
),
]