Skip to content

Commit

Permalink
Merge pull request #234 from nephila/feature/fix_onsite
Browse files Browse the repository at this point in the history
Fix onsite filter
  • Loading branch information
yakky committed Apr 29, 2016
2 parents e29d621 + 5883132 commit e44b5eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion djangocms_blog/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def get_queryset(self):
if not getattr(self.request, 'toolbar', False) or not self.request.toolbar.edit_mode:
queryset = queryset.published()
setattr(self.request, get_setting('CURRENT_NAMESPACE'), self.config)
return queryset
return queryset.on_site()

def get_template_names(self):
template_path = (self.config and self.config.template_prefix) or 'djangocms_blog'
Expand Down
4 changes: 4 additions & 0 deletions tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ def test_post_list_view(self):
self.assertContains(response, context['post_list'][0].get_absolute_url())
self.assertEqual(getattr(request, BLOG_CURRENT_NAMESPACE), self.app_config_1)

posts[1].sites.add(self.site_2)
self.assertTrue(view_obj.get_queryset().count(), 2)
self.assertFalse(posts[1] in view_obj.get_queryset())

with smart_override('it'):
request = self.get_page_request(pages[1], self.user, lang='it', edit=True)
view_obj = PostListView()
Expand Down

0 comments on commit e44b5eb

Please sign in to comment.