Change naming from 'modal text' to 'basic knowledge'

client/src/components/ContentBlock.vue

@@ -21,7 +21,7 @@
     components: {
       'text_block': TextBlock,
       // todo: rename in backend
-      'modal_text': BasicKnowledgeWidget,
+      'basic_knowledge': BasicKnowledgeWidget,
       'student_entry': StudentEntry,
       'image_block': ImageBlock,
       Task

server/book/blocks.py

@@ -8,8 +8,8 @@ class TextBlock(blocks.StructBlock):
     text = blocks.RichTextBlock()
 
 
-# 'modal_text'
-class ModalTextBlock(blocks.StructBlock):
+# 'basic_knowledge'
+class BasicKnowledgeBlock(blocks.StructBlock):
     description = blocks.RichTextBlock()
     url = blocks.URLBlock()
 
@@ -19,7 +19,7 @@ class StudentEntryBlock(blocks.StructBlock):
     task_text = blocks.RichTextBlock()
 
 
-# 'text_block' 'task' 'modal_text' 'student_entry' 'image_block'
+# 'text_block' 'task' 'basic_knowledge' 'student_entry' 'image_block'
 #
 # url = blocks.URLBlock()
 # document = DocumentChooserBlock()

server/book/factories.py

@@ -6,7 +6,7 @@ import wagtail_factories
 from factory import CREATE_STRATEGY
 from wagtail.core.rich_text import RichText
 
-from book.blocks import ModalTextBlock, StudentEntryBlock
+from book.blocks import BasicKnowledgeBlock, StudentEntryBlock
 from book.models import Book, Topic, Module, Chapter, ContentBlock, TextBlock
 from core.factories import BasePageFactory, fake, DummyImageFactory, fake_title, fake_title_noparam, fake_paragraph
 
@@ -49,12 +49,12 @@ class TextBlockFactory(wagtail_factories.StructBlockFactory):
         model = TextBlock
 
 
-class ModalTextBlockFactory(wagtail_factories.StructBlockFactory):
+class BasicKnowledgeBlockFactory(wagtail_factories.StructBlockFactory):
     description = factory.LazyAttribute(fake_paragraph)
     url = factory.LazyAttribute(lambda x: fake.uri())
 
     class Meta:
-        model = ModalTextBlock
+        model = BasicKnowledgeBlock
 
 
 class StudentEntryBlockFactory(wagtail_factories.StructBlockFactory):
@@ -63,7 +63,7 @@ class StudentEntryBlockFactory(wagtail_factories.StructBlockFactory):
         model = StudentEntryBlock
 
 
-block_types = ['text_block', 'modal_text', 'student_entry', 'image_block', 'task']
+block_types = ['text_block', 'basic_knowledge', 'student_entry', 'image_block', 'task']
 
 
 class ContentBlockFactory(BasePageFactory):
@@ -74,7 +74,7 @@ class ContentBlockFactory(BasePageFactory):
 
     contents = wagtail_factories.StreamFieldFactory({
         'text_block': TextBlockFactory,
-        'modal_text': ModalTextBlockFactory,
+        'basic_knowledge': BasicKnowledgeBlockFactory,
         'student_entry': StudentEntryBlockFactory,
         'image_block': wagtail_factories.ImageChooserBlockFactory,
         'task': TextBlockFactory
@@ -93,9 +93,9 @@ class ContentBlockFactory(BasePageFactory):
                 block_type = random.choice(block_types)
                 if block_type == 'text_block':
                     kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'text_block', 'text')] = RichText(fake_paragraph())
-                elif block_type == 'modal_text':
-                    kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'modal_text', 'description')] = RichText(fake_paragraph())
-                    # kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'modal_text', 'description')] = ..url..
+                elif block_type == 'basic_knowledge':
+                    kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = RichText(fake_paragraph())
+                    # kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = ..url..
                 elif block_type == 'student_entry':
                     kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'student_entry', 'task_text')] = RichText(fake_paragraph())
                 elif block_type == 'image_block':

server/book/migrations/0002_auto_20180823_1027.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.0.6 on 2018-08-23 10:27
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('book', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='contents',
+            field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='doc-full')), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='placeholder')), ('student_entry', wagtail.core.blocks.StructBlock([('task_text', wagtail.core.blocks.RichTextBlock())], icon='download')), ('image_block', wagtail.images.blocks.ImageChooserBlock(icon='image')), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick'))], blank=True, null=True),
+        ),
+    ]

server/book/models/contentblock.py

@@ -5,7 +5,7 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList,
 from wagtail.core.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
 
-from book.blocks import TextBlock, ModalTextBlock, StudentEntryBlock
+from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock
 from core.wagtail_utils import StrictHierarchyPage
 
 logger = logging.getLogger(__name__)
@@ -18,7 +18,7 @@ class ContentBlock(StrictHierarchyPage):
 
     contents = StreamField([
         ('text_block', TextBlock(icon='doc-full')),
-        ('modal_text', ModalTextBlock(icon='placeholder')),
+        ('basic_knowledge', BasicKnowledgeBlock(icon='placeholder')),
         ('student_entry', StudentEntryBlock(icon='download')),
         ('image_block', ImageChooserBlock(icon='image')),
         ('task', TextBlock(icon='tick'))