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

fix a typo, update admin base classes

Browse source
This commit is contained in:
Tadas Dailyda 2014-11-30 21:48:51 +00:00
commit 16441b43f7
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
djangocms_blog/admin.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from admin_enhancer.admin import EnhancedModelAdminMixin 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 copy import deepcopy
from django.contrib import admin from django.contrib import admin
from django.conf import settings from django.conf import settings
@ -23,8 +23,8 @@ class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin):
} }
class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin, class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdminMixin,
PlaceholderAdmin, TranslatableAdmin): PlaceholderAdminMixin, TranslatableAdmin, admin.ModelAdmin):
form = PostAdminForm form = PostAdminForm
list_display = ['title', 'author', 'date_published', 'date_published_end'] list_display = ['title', 'author', 'date_published', 'date_published_end']
date_hierarchy = 'date_published' date_hierarchy = 'date_published'

4
djangocms_blog/templates/djangocms_blog/post_detail.html
View file

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

2
djangocms_blog/views.py
View file

@ -50,7 +50,7 @@ class PostDetailView(TranslatableSlugMixin, BaseBlogView, DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(PostDetailView, self).get_context_data(**kwargs) context = super(PostDetailView, self).get_context_data(**kwargs)
context['meta'] = self.get_object().as_meta() 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()) setattr(self.request, BLOG_CURRENT_POST_IDENTIFIER, self.get_object())
return context return context