Fix latest posts pluing. Fix #112

nephila · Apr 20, 2015 · 74c0ae6 · 74c0ae6
1 parent 50da520
commit 74c0ae6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py
@@ -255,9 +255,10 @@ def copy_relations(self, oldinstance):
 
     def get_posts(self, request):
         posts = self.post_queryset(request)
-        tags = list(self.tags.all())
-        if tags:
-            posts = posts.filter(tags__in=tags)
+        if self.tags.exists():
+            posts = posts.filter(tags__in=list(self.tags.all()))
+        if self.categories.exists():
+            posts = posts.filter(categories__in=list(self.categories.all()))
         return posts[:self.latest_posts]
 
 

diff --git a/tests/test_plugins.py b/tests/test_plugins.py
@@ -7,6 +7,7 @@
 from taggit.models import Tag
 
 from . import BaseTest
+from djangocms_blog.models import BlogCategory
 
 
 class PluginTest(BaseTest):
@@ -19,6 +20,7 @@ def test_plugin_latest(self):
         post1.publish = True
         post1.save()
         ph = page1.placeholders.get(slot='content')
+
         plugin = add_plugin(ph, 'BlogLatestEntriesPlugin', language='en')
         tag = Tag.objects.get(slug='tag-1')
         plugin.tags.add(tag)
@@ -31,6 +33,24 @@ def test_plugin_latest(self):
         self.assertTrue(rendered.find('<article id="post-first-post"') > -1)
         self.assertTrue(rendered.find(post1.get_absolute_url()) > -1)
 
+
+        category_2 = BlogCategory.objects.create(name=u'category 2')
+        category_2.set_current_language('it', initialize=True)
+        category_2.name = u'categoria 2'
+        category_2.save()
+        category_2.set_current_language('en')
+        post2.categories.add(category_2)
+        plugin = add_plugin(ph, 'BlogLatestEntriesPlugin', language='en')
+        plugin.categories.add(category_2)
+        request = self.get_page_request(page1, self.user, r'/en/blog/', lang_code='en', edit=True)
+        context = RequestContext(request, {})
+        rendered = plugin.render_plugin(context, ph)
+        self.assertTrue(rendered.find('cms_plugin-djangocms_blog-post-abstract-2') > -1)
+        self.assertTrue(rendered.find(reverse('djangocms_blog:posts-category', kwargs={'category': category_2.slug})) > -1)
+        self.assertTrue(rendered.find('<p>second post first line</p>') > -1)
+        self.assertTrue(rendered.find('<article id="post-second-post"') > -1)
+        self.assertTrue(rendered.find(post2.get_absolute_url()) > -1)
+
     def test_plugin_authors(self):
         page1, page2 = self.get_pages()
         post1 = self._get_post(self.data['en'][0])