Add link and external field to step blocks. This makes it possible to

bluebottle/cms/content_plugins.py

@@ -32,10 +32,10 @@ class Media(object):
             "all": ('admin/css/forms-nested.css', )
         }
         js = (
-            'admin/js/inlines-nested.js',
+            'admin/js/jquery.init.js',
+            'admin/js/inlines-nested.min.js',
             'js/csrf.js',
             'adminsortable/js/jquery-ui-django-admin.min.js',
-            'adminsortable/js/admin.sortable.stacked.inlines.js'
         )
 
 

bluebottle/cms/migrations/0069_step_link.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2022-08-29 09:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0068_auto_20220121_1448'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='step',
+            name='link',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]

bluebottle/cms/migrations/0070_auto_20220829_1600.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.24 on 2022-08-29 14:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0069_step_link'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='step',
+            name='external',
+            field=models.BooleanField(default=False, help_text='Open the link in a new browser tab', verbose_name='Open in new tab'),
+        ),
+        migrations.AlterField(
+            model_name='step',
+            name='link',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Link'),
+        ),
+    ]

bluebottle/cms/migrations/0071_merge_20220906_0730.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.24 on 2022-09-06 05:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0070_homepagestatisticscontent_year'),
+        ('cms', '0070_auto_20220829_1600'),
+    ]
+
+    operations = [
+    ]

bluebottle/cms/models.py

@@ -406,6 +406,10 @@ class Step(SortableMixin, models.Model):
     )
     header = models.CharField(_("Header"), max_length=100)
     text = models.CharField(_("Text"), max_length=400, null=True, blank=True)
+    link = models.CharField(_("Link"), max_length=100, blank=True, null=True)
+    external = models.BooleanField(_("Open in new tab"), default=False, blank=False,
+                                   help_text=_('Open the link in a new browser tab'))
+
     sequence = models.PositiveIntegerField(default=0, editable=False, db_index=True)
 
     class Meta:

bluebottle/cms/serializers.py

@@ -269,7 +269,7 @@ class StepSerializer(serializers.ModelSerializer):
 
     class Meta(object):
         model = Step
-        fields = ('id', 'image', 'header', 'text', )
+        fields = ('id', 'image', 'header', 'text', 'link', 'external')
 
 
 class StepsContentSerializer(serializers.ModelSerializer):

bluebottle/cms/tests/test_commands.py

@@ -42,6 +42,8 @@
                             'text': 'Go!',
                             'image': '',
                             'header': 'First',
+                            'link': None,
+                            'external': False,
                             'sequence': 1
                         },
                         'app': 'cms'
@@ -51,6 +53,8 @@
                             'text': 'Go!',
                             'image': '',
                             'header': 'Second',
+                            'link': None,
+                            'external': False,
                             'sequence': 2
                         },
                         'app': 'cms'
@@ -60,6 +64,8 @@
                             'text': 'Go!',
                             'image': '',
                             'header': 'Third',
+                            'link': None,
+                            'external': False,
                             'sequence': 3
                         },
                         'app': 'cms'

bluebottle/utils/validators.py

@@ -108,6 +108,7 @@ def __init__(self, allowed_mimetypes=None, message=None, code=None):
 
     def __call__(self, value):
         try:
+            value.file.seek(0)
             mimetype = mime.from_buffer(value.file.read(3084))
         except FileNotFoundError:
             return