From 5e2d544e85e8b2e01f08522afd1375887fe8b339 Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Mon, 17 Dec 2018 18:08:05 +0100 Subject: [PATCH] Menus template tag. --- content_plugins/templatetags/feincms3_helper_tags.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/content_plugins/templatetags/feincms3_helper_tags.py b/content_plugins/templatetags/feincms3_helper_tags.py index db510a6..9e6a233 100644 --- a/content_plugins/templatetags/feincms3_helper_tags.py +++ b/content_plugins/templatetags/feincms3_helper_tags.py @@ -29,17 +29,20 @@ def menus(): ~Q(menu=''), *q_filters, ).extra( - where=['level BETWEEN {} AND {}'.format(depth_from, depth_to)], + where=['level BETWEEN %s AND %s'], + params=[depth_from, depth_to], ) except FieldDoesNotExist: + # FeinCMS3 Model pages = model.objects.with_tree_fields().filter( ~Q(menu=''), *q_filters, ).extra( - where=['tree_depth BETWEEN {} AND {}'.format(depth_from, depth_to)], + where=['tree_depth BETWEEN %s AND %s'], + params=[depth_from, depth_to], ) - for content in pages: - menus[content.menu].append(content) + for page in pages: + menus[page.menu].append(page) for k, v in MENUMIXIN_MODELS.items(): add_menus_from_model(