ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #321 from nephila/hotfix/thumbnail_model

Browse source 
Use correct ThumbnailOption model in migrations
This commit is contained in:
Iacopo Spalletti 2016-09-04 06:39:53 +02:00 committed by GitHub
commit 97971b511e
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cms_helper.py
View file

@ -96,6 +96,7 @@ HELPER_SETTINGS = dict(
HAYSTACK_CONNECTIONS={
'default': {}
},
BLOG_AUTO_SETUP=False,
)
try:

12
djangocms_blog/migrations/0021_auto_20160823_2008.py
View file

@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.9 on 2016-08-23 18:08
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from djangocms_blog.models import thumbnail_model
class Migration(migrations.Migration):
@ -16,26 +16,26 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='authorentriesplugin',
name='cmsplugin_ptr',
field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_authorentriesplugin', serialize=False, to='cms.CMSPlugin'),
field=models.OneToOneField(parent_link=True, related_name='djangocms_blog_authorentriesplugin', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin'),
),
migrations.AlterField(
model_name='genericblogplugin',
name='cmsplugin_ptr',
field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_genericblogplugin', serialize=False, to='cms.CMSPlugin'),
field=models.OneToOneField(parent_link=True, related_name='djangocms_blog_genericblogplugin', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin'),
),
migrations.AlterField(
model_name='latestpostsplugin',
name='cmsplugin_ptr',
field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_latestpostsplugin', serialize=False, to='cms.CMSPlugin'),
field=models.OneToOneField(parent_link=True, related_name='djangocms_blog_latestpostsplugin', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin'),
),
migrations.AlterField(
model_name='post',
name='main_image_full',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='djangocms_blog_post_full', to='filer.ThumbnailOption', verbose_name='main image full'),
field=models.ForeignKey(related_name='djangocms_blog_post_full', on_delete=django.db.models.deletion.SET_NULL, verbose_name='main image full', blank=True, to=thumbnail_model, null=True),
),
migrations.AlterField(
model_name='post',
name='main_image_thumbnail',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='djangocms_blog_post_thumbnail', to='filer.ThumbnailOption', verbose_name='main image thumbnail'),
field=models.ForeignKey(related_name='djangocms_blog_post_thumbnail', on_delete=django.db.models.deletion.SET_NULL, verbose_name='main image thumbnail', blank=True, to=thumbnail_model, null=True),
),
]

6
tests/test_setup.py
View file

@ -12,7 +12,13 @@ from djangocms_blog.cms_appconfig import BlogConfig
from .base import BaseTest
try:
from django.test import override_settings
except ImportError:
from django.test.utils import override_settings
@override_settings(BLOG_AUTO_SETUP=True)
class SetupTest(BaseTest):
@classmethod

2
tox.ini
View file

@ -41,7 +41,7 @@ deps =
knocker: djangocms-text-ckeditor<3.0
django-meta>=1.2
html5lib<0.99999999
https://github.com/nephila/djangocms-helper/archive/develop.zip
https://github.com/nephila/djangocms-helper/archive/release/0.9.x.zip
https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip
https://github.com/nephila/djangocms-apphook-setup/archive/master.zip
-r{toxinidir}/requirements-test.txt