From 8f6b2e38471fabc62e00daea1cb0b5136220ee84 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 15 Mar 2021 22:47:27 +0100 Subject: [PATCH] Add rich text editor to assignment solution --- server/assignments/models.py | 5 ++++- server/basicknowledge/models.py | 3 ++- server/books/blocks.py | 4 +--- server/books/models/module.py | 2 +- server/books/models/topic.py | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/assignments/models.py b/server/assignments/models.py index 325fec72..18b3f46c 100644 --- a/server/assignments/models.py +++ b/server/assignments/models.py @@ -2,15 +2,18 @@ from django.contrib.auth import get_user_model from django.db import models from django_extensions.db.models import TimeStampedModel from wagtail.admin.edit_handlers import FieldPanel +from wagtail.core.fields import RichTextField from wagtail.snippets.models import register_snippet from wagtailautocomplete.edit_handlers import AutocompletePanel +from core.constants import DEFAULT_RICH_TEXT_FEATURES + @register_snippet class Assignment(TimeStampedModel): title = models.CharField(max_length=255) assignment = models.TextField() - solution = models.TextField(null=True, blank=True) + solution = RichTextField(null=True, blank=True, features=DEFAULT_RICH_TEXT_FEATURES) deleted = models.BooleanField(default=False) owner = models.ForeignKey(get_user_model(), on_delete=models.PROTECT, null=True, diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py index abab4461..128b95f3 100644 --- a/server/basicknowledge/models.py +++ b/server/basicknowledge/models.py @@ -4,7 +4,8 @@ from wagtail.core.fields import StreamField, RichTextField from wagtail.images.blocks import ImageChooserBlock from books.blocks import LinkBlock, VideoBlock, DocumentBlock, SectionTitleBlock, InfogramBlock, \ - GeniallyBlock, InstrumentTextBlock, SubtitleBlock, ThinglinkBlock, DEFAULT_RICH_TEXT_FEATURES + GeniallyBlock, InstrumentTextBlock, SubtitleBlock, ThinglinkBlock +from core.constants import DEFAULT_RICH_TEXT_FEATURES from core.wagtail_utils import StrictHierarchyPage diff --git a/server/books/blocks.py b/server/books/blocks.py index fa852ea8..8ec10659 100644 --- a/server/books/blocks.py +++ b/server/books/blocks.py @@ -2,11 +2,9 @@ from wagtail.core import blocks from wagtail.snippets.blocks import SnippetChooserBlock from assignments.models import Assignment +from core.constants import DEFAULT_RICH_TEXT_FEATURES, INSTRUMENTS_RICH_TEXT_FEATURES from surveys.models import Survey -DEFAULT_RICH_TEXT_FEATURES = ['ul', ] -INSTRUMENTS_RICH_TEXT_FEATURES = ['bold', 'ul', 'brand', 'secondary'] - # link_block class LinkBlock(blocks.StructBlock): diff --git a/server/books/models/module.py b/server/books/models/module.py index 093a082b..94a058df 100644 --- a/server/books/models/module.py +++ b/server/books/models/module.py @@ -6,7 +6,7 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList from wagtail.core.fields import RichTextField from wagtail.images.edit_handlers import ImageChooserPanel -from books.blocks import DEFAULT_RICH_TEXT_FEATURES +from core.constants import DEFAULT_RICH_TEXT_FEATURES from core.wagtail_utils import StrictHierarchyPage from users.models import SchoolClass diff --git a/server/books/models/topic.py b/server/books/models/topic.py index 04638f9d..c4918a14 100644 --- a/server/books/models/topic.py +++ b/server/books/models/topic.py @@ -4,7 +4,7 @@ from django.db import models from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList from wagtail.core.fields import RichTextField -from books.blocks import DEFAULT_RICH_TEXT_FEATURES +from core.constants import DEFAULT_RICH_TEXT_FEATURES from core.wagtail_utils import StrictHierarchyPage logger = logging.getLogger(__name__)