From e23dc4a9f0c7e125a3b267cfb9c2caa805937da1 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 25 Oct 2018 15:06:35 +0200 Subject: [PATCH] Refactor code --- server/books/models/contentblock.py | 6 ------ server/books/wagtail_hooks.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 server/books/wagtail_hooks.py diff --git a/server/books/models/contentblock.py b/server/books/models/contentblock.py index 34b2204d..8c285bac 100644 --- a/server/books/models/contentblock.py +++ b/server/books/models/contentblock.py @@ -4,7 +4,6 @@ from django.db import models from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList, StreamFieldPanel from wagtail.core.fields import StreamField from wagtail.images.blocks import ImageChooserBlock -from wagtail.core import hooks from books.blocks import TextBlock, BasicKnowledgeBlock, LinkBlock, VideoBlock, DocumentBlock, \ ImageUrlBlock, AssignmentBlock @@ -74,8 +73,3 @@ class ContentBlock(StrictHierarchyPage): subpage_types = [] -@hooks.register('construct_explorer_page_queryset') -def remove_user_created_content_blocks_from_menu(parent_page, pages, request): - if parent_page.content_type.model == 'chapter': - return ContentBlock.get_by_parent(parent_page.specific).exclude(user_created=True) - return pages diff --git a/server/books/wagtail_hooks.py b/server/books/wagtail_hooks.py new file mode 100644 index 00000000..733a151d --- /dev/null +++ b/server/books/wagtail_hooks.py @@ -0,0 +1,10 @@ +from wagtail.core import hooks + +from .models import ContentBlock + + +@hooks.register('construct_explorer_page_queryset') +def remove_user_created_content_blocks_from_menu(parent_page, pages, request): + if parent_page.content_type.model == 'chapter': + return ContentBlock.get_by_parent(parent_page.specific).exclude(user_created=True) + return pages