Fix issues related to parler
This commit is contained in:
parent
e341948bdc
commit
a1b2c56305
2 changed files with 10 additions and 9 deletions
|
|
@ -174,14 +174,9 @@ class Post(ModelMeta, TranslatableModel):
|
||||||
return reverse('djangocms_blog:post-detail', kwargs=kwargs)
|
return reverse('djangocms_blog:post-detail', kwargs=kwargs)
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
super(Post, self).save(*args, **kwargs)
|
|
||||||
main_lang = self.get_current_language()
|
|
||||||
for lang in self.get_available_languages():
|
|
||||||
self.set_current_language(lang)
|
|
||||||
if not self.slug and self.title:
|
if not self.slug and self.title:
|
||||||
self.slug = slugify(self.title)
|
self.slug = slugify(self.title)
|
||||||
self.set_current_language(main_lang)
|
super(Post, self).save(*args, **kwargs)
|
||||||
self.save_translations()
|
|
||||||
|
|
||||||
def get_title(self):
|
def get_title(self):
|
||||||
title = self.safe_translation_getter('meta_title', any_language=True)
|
title = self.safe_translation_getter('meta_title', any_language=True)
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,10 @@ class BaseBlogView(ViewUrlMixin):
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
language = get_language()
|
language = get_language()
|
||||||
queryset = self.model._default_manager.active_translations(language_code=language)
|
queryset = self.model._default_manager.all().active_translations(language_code=language)
|
||||||
if not getattr(self.request, 'toolbar', False) or not self.request.toolbar.edit_mode:
|
if not getattr(self.request, 'toolbar', False) or not self.request.toolbar.edit_mode:
|
||||||
queryset = queryset.published()
|
queryset = queryset.published()
|
||||||
return queryset.on_site()
|
return queryset
|
||||||
|
|
||||||
def render_to_response(self, context, **response_kwargs):
|
def render_to_response(self, context, **response_kwargs):
|
||||||
response_kwargs['current_app'] = resolve(self.request.path).namespace
|
response_kwargs['current_app'] = resolve(self.request.path).namespace
|
||||||
|
|
@ -46,6 +46,12 @@ class PostDetailView(TranslatableSlugMixin, BaseBlogView, DetailView):
|
||||||
slug_field = 'slug'
|
slug_field = 'slug'
|
||||||
view_url_name = 'djangocms_blog:post-detail'
|
view_url_name = 'djangocms_blog:post-detail'
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
queryset = self.model._default_manager.all()
|
||||||
|
if not getattr(self.request, 'toolbar', False) or not self.request.toolbar.edit_mode:
|
||||||
|
queryset = queryset.published()
|
||||||
|
return queryset
|
||||||
|
|
||||||
def get(self, *args, **kwargs):
|
def get(self, *args, **kwargs):
|
||||||
# submit object to cms to get corrent language switcher and selected category behavior
|
# submit object to cms to get corrent language switcher and selected category behavior
|
||||||
if hasattr(self.request, 'toolbar'):
|
if hasattr(self.request, 'toolbar'):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue