Merge pull request #5257 from onepercentclub/hotfix/remove-unused-fields

Remove obsolete fields on activity block
onepercentclub · Sep 26, 2022 · dd848ca · dd848ca
2 parents 68c9b9b + dd50da4
commit dd848ca
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/bluebottle/cms/content_plugins.py b/bluebottle/cms/content_plugins.py
@@ -64,7 +64,6 @@ class HomepageStatisticsBlockPlugin(CMSContentPlugin):
 @plugin_pool.register
 class ActivitiesBlockPlugin(CMSContentPlugin):
     model = ActivitiesContent
-    raw_id_fields = ('activities', )
     category = _('Activities')
 
 

diff --git a/bluebottle/cms/migrations/0072_auto_20220922_1104.py b/bluebottle/cms/migrations/0072_auto_20220922_1104.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.24 on 2022-09-22 09:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0071_merge_20220906_0730'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='activitiescontent',
+            name='activities',
+        ),
+        migrations.RemoveField(
+            model_name='activitiescontent',
+            name='highlighted',
+        ),
+    ]
diff --git a/bluebottle/cms/models.py b/bluebottle/cms/models.py
@@ -8,7 +8,6 @@
 from parler.models import TranslatableModel, TranslatedFields
 from solo.models import SingletonModel
 
-from bluebottle.activities.models import Activity
 from bluebottle.categories.models import Category
 from bluebottle.geo.models import Location
 from bluebottle.utils.fields import ImageField
@@ -253,11 +252,6 @@ class ActivitiesContent(TitledContent):
     action_link = models.CharField(max_length=100, default="/initiatives/activities/list",
                                    blank=True, null=True)
 
-    activities = models.ManyToManyField(
-        Activity, blank=True, db_table='cms_activitycontent_activities'
-    )
-    highlighted = models.BooleanField(default=False)
-
     preview_template = 'admin/cms/preview/activities.html'
 
     class Meta:

diff --git a/bluebottle/cms/templates/admin/cms/preview/activities.html b/bluebottle/cms/templates/admin/cms/preview/activities.html
@@ -1,7 +1,4 @@
-<ul>
-{% for activity in instance.activities.all %}
-    <li>{{ activity.title }}</li>
-{% endfor %}
-</ul>
+{% load i18n%}
 
-{{ instance.action }}
+{% trans "Toggle 'highlight' on activities to show them in this block." %}
+{{ instance.action }}
diff --git a/bluebottle/cms/tests/test_api.py b/bluebottle/cms/tests/test_api.py
@@ -150,9 +150,8 @@ def test_results_quotes(self):
         self.assertEqual(quotes['quotes'][0]['quote'], self.quote.quote)
 
     def test_results_activities(self):
-        activity = DateActivityFactory.create(status='open')
-        block = ActivitiesContent.objects.create_for_placeholder(self.placeholder)
-        block.activities.add(activity)
+        DateActivityFactory.create(status='open', highlight=True)
+        ActivitiesContent.objects.create_for_placeholder(self.placeholder)
 
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -290,7 +289,7 @@ def test_homepage(self):
 
     def test_activities_from_homepage(self):
         DateActivityFactory.create_batch(10, status='open', highlight=True)
-        ActivitiesContent.objects.create_for_placeholder(self.placeholder, highlighted=True)
+        ActivitiesContent.objects.create_for_placeholder(self.placeholder)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['blocks'][0]['type'], 'activities')