From 0a9c048a7d5dae582ec7aabb0787075589155a05 Mon Sep 17 00:00:00 2001 From: Alex Hill Date: Wed, 8 Apr 2015 14:03:08 +0800 Subject: [PATCH 1/2] Set CurrentSiteManager.use_in_migrations = False --- mezzanine/core/managers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index b655d82433..385c4f5df4 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -334,6 +334,8 @@ class CurrentSiteManager(DjangoCSM): to ``settings.SITE_ID`` if none of those match a site. """ + use_in_migrations = False + def __init__(self, field_name=None, *args, **kwargs): super(DjangoCSM, self).__init__(*args, **kwargs) self.__field_name = field_name From 654c895a52504f6bc37b8921bd97d5b52356bbb7 Mon Sep 17 00:00:00 2001 From: Alex Hill Date: Wed, 8 Apr 2015 14:04:08 +0800 Subject: [PATCH 2/2] Migrations for Django 1.8 --- mezzanine/forms/migrations/0003_emailfield.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 mezzanine/forms/migrations/0003_emailfield.py diff --git a/mezzanine/forms/migrations/0003_emailfield.py b/mezzanine/forms/migrations/0003_emailfield.py new file mode 100644 index 0000000000..9f826c6a5e --- /dev/null +++ b/mezzanine/forms/migrations/0003_emailfield.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import mezzanine.pages.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0002_auto_20141227_0224'), + ] + + operations = [ + migrations.AlterField( + model_name='form', + name='email_from', + field=models.EmailField(help_text='The address the email will be sent from', max_length=254, verbose_name='From address', blank=True), + ), + ]