Merging

publichealth/home/templatetags/navigation.py

@@ -77,12 +77,12 @@ def menuitems_children(parent, context=None):
     menuitems_children = parent.get_children().live().in_menu().specific()
     items_to_remove = []
     for menuitem in menuitems_children:
+        print('type => %s' % type(menuitem))
         try:
             if 'devenez' in menuitem.title.lower() and remove_devenez:
                 items_to_remove.append(menuitem)
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
-            menuitem.title = menuitem.trans_title
         except AttributeError as ae:
             print("Menuitem %s has an issue :: %s" % (menuitem.title, str(ae)))
             pass
@@ -100,6 +100,11 @@ def menuitems_children(parent, context=None):
             menuitems_children.append(custom_page)
             page_ids = [page.id for page in menuitems_children]
             menuitems_children = Page.objects.filter(id__in=page_ids).specific()
+            for menuitem in menuitems_children:
+                try:
+                    menuitem.title = menuitem.trans_title
+                except AttributeError as aee:
+                    pass
     return menuitems_children
 
 # Retrieves the children of the top menu items for the drop downs