From 335a12bdd554296186d10e24cf7f92112877e74e Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sat, 30 Apr 2016 00:54:55 +0200 Subject: [PATCH] Remove meta_mixin references --- HISTORY.rst | 10 +++++++--- djangocms_blog/migrations/0001_initial.py | 4 ++-- djangocms_blog/models.py | 2 +- djangocms_blog/settings.py | 2 +- djangocms_blog/templates/djangocms_blog/base.html | 2 +- tests/test_utils/templates/blog.html | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 12200af..eef553e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,9 +6,13 @@ History 0.8.0 (unreleased) ++++++++++++++++++ -* Add django-knocker integration -* Change the default value of date_published to null -* Clear menu cache when changing menu layout in apphook config +* Added django-knocker integration +* Changed the default value of date_published to null +* Cleared menu cache when changing menu layout in apphook config +* Fixed error with wizard multiple registration +* Made django CMS 3.2 the default version +* Fixed error with on_site filter +* Removed meta-mixin compatibility code 0.7.0 (2016-03-19) ++++++++++++++++++ diff --git a/djangocms_blog/migrations/0001_initial.py b/djangocms_blog/migrations/0001_initial.py index 24e53a0..ca16ba9 100644 --- a/djangocms_blog/migrations/0001_initial.py +++ b/djangocms_blog/migrations/0001_initial.py @@ -5,7 +5,7 @@ import cms.models.fields import django.utils.timezone import djangocms_text_ckeditor.fields import filer.fields.image -import meta_mixin.models +import meta.models import taggit_autosuggest.managers from django.conf import settings from django.db import migrations, models @@ -106,7 +106,7 @@ class Migration(migrations.Migration): 'verbose_name': 'blog article', 'verbose_name_plural': 'blog articles', }, - bases=(meta_mixin.models.ModelMeta, models.Model), + bases=(meta.models.ModelMeta, models.Model), ), migrations.CreateModel( name='PostTranslation', diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py index 285526f..350fe45 100644 --- a/djangocms_blog/models.py +++ b/djangocms_blog/models.py @@ -15,7 +15,7 @@ from django.utils.text import slugify from django.utils.translation import get_language, ugettext_lazy as _ from djangocms_text_ckeditor.fields import HTMLField from filer.fields.image import FilerImageField -from meta_mixin.models import ModelMeta +from meta.models import ModelMeta from parler.models import TranslatableModel, TranslatedFields from parler.utils.context import switch_language from taggit_autosuggest.managers import TaggableManager diff --git a/djangocms_blog/settings.py b/djangocms_blog/settings.py index 3fb98c5..80ee1a8 100644 --- a/djangocms_blog/settings.py +++ b/djangocms_blog/settings.py @@ -10,7 +10,7 @@ MENU_TYPE_NONE = 'none' def get_setting(name): from django.conf import settings from django.utils.translation import ugettext_lazy as _ - from meta_mixin import settings as meta_settings + from meta import settings as meta_settings PERMALINKS = ( ('full_date', _('Full date')), diff --git a/djangocms_blog/templates/djangocms_blog/base.html b/djangocms_blog/templates/djangocms_blog/base.html index cf88d78..f383dc8 100644 --- a/djangocms_blog/templates/djangocms_blog/base.html +++ b/djangocms_blog/templates/djangocms_blog/base.html @@ -2,7 +2,7 @@ {% block meta %} {% if meta %} - {% include "meta_mixin/meta.html" %} + {% include "meta/meta.html" %} {% endif %} {% endblock meta %} diff --git a/tests/test_utils/templates/blog.html b/tests/test_utils/templates/blog.html index 7916c68..1ba3b7c 100644 --- a/tests/test_utils/templates/blog.html +++ b/tests/test_utils/templates/blog.html @@ -5,7 +5,7 @@ {% block title %}{% page_attribute 'title' %}{% endblock title %} {% render_block "css" %} {% block canonical_url %}{% endblock canonical_url %} - {% include "meta_mixin/meta.html" %} + {% include "meta/meta.html" %}