fix a typo, update admin base classes

This commit is contained in:
Tadas Dailyda 2014-11-30 21:48:51 +00:00
parent 1c7674f94f
commit 76b5758007
3 changed files with 6 additions and 6 deletions
djangocms_blog
admin.py
templates/djangocms_blog
views.py

View file

@ -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
@ -21,8 +21,8 @@ class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin):
}
class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin,
PlaceholderAdmin, TranslatableAdmin):
class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdminMixin,
PlaceholderAdminMixin, TranslatableAdmin, admin.ModelAdmin):
list_display = ['title', 'author', 'date_published', 'date_published_end']
date_hierarchy = 'date_published'
raw_id_fields = ['author']

View file

@ -40,10 +40,10 @@
<img src="{{ thumb.url }}" alt="{{ post.main_image.default_alt_text }}" width="{{ thumb.width }}" height="{{ thumb.height }}" />
</div>
{% endif %}
{% if use_placeholer %}
{% if use_placeholder %}
<div class="blog-content">{% render_placeholder post.content %}</div>
{% else %}
<div class="blog-content">{% render_model post "post_text" "post_text" %}</div>
{% endif %}
</article>
{% endspaceless %}{% endblock content_blog %}
{% endspaceless %}{% endblock content_blog %}

View file

@ -51,7 +51,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'] = BLOG_USE_PLACEHOLDER
context['use_placeholder'] = BLOG_USE_PLACEHOLDER
setattr(self.request, BLOG_CURRENT_POST_IDENTIFIER, self.get_object())
return context