Merge remote-tracking branch 'origin/data-migration-sub-proposition-p…

…age'
torchbox · Nov 1, 2023 · 07eb496 · 07eb496
2 parents a9d8bd7 + d47566f
commit 07eb496
Show file tree

Hide file tree

Showing 11 changed files with 1,961 additions and 14 deletions.
diff --git a/tbx/propositions/blocks.py b/tbx/propositions/blocks.py
@@ -44,16 +44,6 @@ class Meta:
         template = "patterns/molecules/streamfield/blocks/key-points.html"
 
 
-class TestimonialBlock(blocks.StructBlock):
-    quote = blocks.TextBlock()
-    name = blocks.CharBlock(max_length=255)
-    role = blocks.CharBlock(max_length=255)
-
-    class Meta:
-        icon = "openquote"
-        label = "Testimonial"
-
-
 class TestimonialsBlock(blocks.StructBlock):
     title = blocks.CharBlock(
         label="Testimonials section title",
@@ -65,7 +55,7 @@ class TestimonialsBlock(blocks.StructBlock):
         required=False,
     )
     testimonials = blocks.ListBlock(
-        TestimonialBlock(),
+        core_blocks.TestimonialBlock(),
         required=False,
     )
 
@@ -201,7 +191,7 @@ def get_featured_blog_posts(self, value):
                 "date": blog_post.date,
             }
             for blog_post in value.get("featured_blog_posts")
-            if blog_post.live
+            if blog_post and blog_post.live
         ]
 
     def get_context(self, value, parent_context=None):

diff --git a/tbx/propositions/management/__init__.py b/tbx/propositions/management/__init__.py
diff --git a/tbx/propositions/management/commands/__init__.py b/tbx/propositions/management/commands/__init__.py