diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index ca76cbd..61bcb9a 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from admin_enhancer.admin import EnhancedModelAdminMixin -from cms.admin.placeholderadmin import PlaceholderAdmin, FrontendEditableAdmin +from cms.admin.placeholderadmin import PlaceholderAdminMixin, FrontendEditableAdminMixin from copy import deepcopy from django.contrib import admin from django.conf import settings @@ -23,8 +23,8 @@ class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin): } -class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin, - PlaceholderAdmin, TranslatableAdmin): +class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdminMixin, + PlaceholderAdminMixin, TranslatableAdmin, admin.ModelAdmin): form = PostAdminForm list_display = ['title', 'author', 'date_published', 'date_published_end'] date_hierarchy = 'date_published' diff --git a/djangocms_blog/templates/djangocms_blog/post_detail.html b/djangocms_blog/templates/djangocms_blog/post_detail.html index 11d63b0..e854608 100644 --- a/djangocms_blog/templates/djangocms_blog/post_detail.html +++ b/djangocms_blog/templates/djangocms_blog/post_detail.html @@ -42,10 +42,10 @@ {{ post.main_image.default_alt_text }} {% endif %} - {% if use_placeholer %} + {% if use_placeholder %}
{% render_placeholder post.content %}
{% else %}
{% render_model post "post_text" "post_text" %}
{% endif %} -{% endspaceless %}{% endblock content_blog %} \ No newline at end of file +{% endspaceless %}{% endblock content_blog %} diff --git a/djangocms_blog/views.py b/djangocms_blog/views.py index e4dd77e..5c97618 100644 --- a/djangocms_blog/views.py +++ b/djangocms_blog/views.py @@ -50,7 +50,7 @@ class PostDetailView(TranslatableSlugMixin, BaseBlogView, DetailView): def get_context_data(self, **kwargs): context = super(PostDetailView, self).get_context_data(**kwargs) context['meta'] = self.get_object().as_meta() - context['use_placeholer'] = get_setting('USE_PLACEHOLDER') + context['use_placeholder'] = get_setting('USE_PLACEHOLDER') setattr(self.request, BLOG_CURRENT_POST_IDENTIFIER, self.get_object()) return context