Merge pull request #195 from nephila/feature/non_required_categories

Fix menu behavior

.checkignore

@@ -0,0 +1,3 @@
+tests/*
+docs/*
+djangocms_blog/south_migrations/*

README.rst

@@ -235,11 +235,14 @@ Menu
 
 ``djangocms_blog`` provides support for django CMS menu framework.
 
-By default all the categories and posts are added to the menu, in a hierarcical structure.
+By default all the categories and posts are added to the menu, in a hierarchical structure.
 
 Is it possibile to configure per Apphook, whether the menu includes post and categories
 (the default), only categorie, only posts or no item.
 
+If "post and categories" or "only categories" are set, all the posts not associated with a
+category are not added to the menu.
+
 Templates
 +++++++++
 

cms_helper.py

@@ -69,7 +69,7 @@ HELPER_SETTINGS = dict(
             {'code': 'en'},
         ),
         'default': {
-            'fallback': 'en',
+            'fallbacks': ['en'],
             'hide_untranslated': False,
         }
     },

djangocms_blog/menu.py

@@ -52,13 +52,16 @@ class BlogCategoryMenu(CMSAttachMenu):
                 posts = posts.namespace(self.instance.application_namespace)
             posts = posts.active_translations(language).distinct()
             for post in posts:
+                post_id = None
+                parent = None
                 if categories_menu:
                     category = post.categories.first()
+                    if category:
                         parent = '%s-%s' % (category.__class__.__name__, category.pk)
                         post_id = '%s-%s' % (post.__class__.__name__, post.pk),
                 else:
-                    parent = None
                     post_id = '%s-%s' % (post.__class__.__name__, post.pk),
+                if post_id:
                     node = NavigationNode(
                         post.get_title(),
                         post.get_absolute_url(language),

tests/test_menu.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 
 from aldryn_apphooks_config.utils import get_app_instance
 from django.core.cache import cache
-from django.utils.translation import activate
+from django.utils.translation import activate, override
 from menus.menu_pool import menu_pool
 from parler.utils.context import smart_override, switch_language
 
@@ -32,22 +32,34 @@ class MenuTest(BaseTest):
         # All cms menu modifiers should be removed from menu_pool.modifiers
         # so that they do not interfere with our menu nodes
         menu_pool.modifiers = [m for m in menu_pool.modifiers if m.__module__.startswith('djangocms_blog')]
+        cache.clear()
 
     def test_menu_nodes(self):
         """
         Tests if all categories are present in the menu
         """
-        self.get_posts()
+        posts = self.get_posts()
-        self.get_pages()
+        pages = self.get_pages()
+        self.reload_urlconf()
 
         for lang in ('en', 'it'):
-            request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
-                nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
+                nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 cats_url = set([cat.get_absolute_url() for cat in self.cats if cat.has_translation(lang)])
                 self.assertTrue(cats_url.issubset(nodes_url))
 
+        cache.clear()
+        posts[0].categories.clear()
+        for lang in ('en', 'it'):
+            with smart_override(lang):
+                request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
+                nodes = menu_pool.get_nodes(request)
+                nodes_url = set([node.url for node in nodes])
+                self.assertFalse(posts[0].get_absolute_url(lang) in nodes_url)
+                self.assertTrue(posts[1].get_absolute_url(lang) in nodes_url)
+
     def test_menu_options(self):
         """
         Tests menu structure based on menu_structure configuration
@@ -72,7 +84,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
-                nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertFalse(cats_url[lang].issubset(nodes_url))
                 self.assertFalse(posts_url[lang].issubset(nodes_url))
@@ -84,7 +96,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
-                nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertFalse(cats_url[lang].issubset(nodes_url))
                 self.assertTrue(posts_url[lang].issubset(nodes_url))
@@ -96,7 +108,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
-                nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertTrue(cats_url[lang].issubset(nodes_url))
                 self.assertFalse(posts_url[lang].issubset(nodes_url))
@@ -108,7 +120,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
-                nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertTrue(cats_url[lang].issubset(nodes_url))
                 self.assertTrue(posts_url[lang].issubset(nodes_url))
@@ -137,7 +149,7 @@ class MenuTest(BaseTest):
                     view_obj.kwargs = {kwarg: obj.slug}
                     view_obj.get(request)
                     # check if selected menu node points to cat
-                    nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
+                    nodes = menu_pool.get_nodes(request)
                     found = False
                     for node in nodes:
                         if node.selected: