liqd · goapunk · Dec 14, 2023 · m4ra · Feb 6, 2024 · goapunk
diff --git a/changelog/_1111.md b/changelog/_1111.md
@@ -0,0 +1,4 @@
+### Removed
+
+- **Breaking Change** prepare the removal of the activities (face2face) app and delete the
+  associated models and views
diff --git a/meinberlin/apps/activities/admin.py b/meinberlin/apps/activities/admin.py
diff --git a/meinberlin/apps/activities/dashboard.py b/meinberlin/apps/activities/dashboard.py
diff --git a/meinberlin/apps/activities/forms.py b/meinberlin/apps/activities/forms.py
diff --git a/meinberlin/apps/activities/migrations/0005_delete_activity.py b/meinberlin/apps/activities/migrations/0005_delete_activity.py
@@ -0,0 +1,15 @@
+# Generated by Django 4.2 on 2023-12-14 13:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meinberlin_activities", "0004_alter_activity_description"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="Activity",
+        ),
+    ]
diff --git a/meinberlin/apps/activities/models.py b/meinberlin/apps/activities/models.py
diff --git a/meinberlin/apps/activities/phases.py b/meinberlin/apps/activities/phases.py
diff --git a/meinberlin/apps/activities/rules.py b/meinberlin/apps/activities/rules.py
diff --git a/meinberlin/apps/activities/templates/meinberlin_activities/activities_dashboard.html b/meinberlin/apps/activities/templates/meinberlin_activities/activities_dashboard.html
diff --git a/meinberlin/apps/activities/templates/meinberlin_activities/activity_detail.html b/meinberlin/apps/activities/templates/meinberlin_activities/activity_detail.html
diff --git a/...lin/apps/activities/templates/meinberlin_activities/includes/activity_detail_content.html b/...lin/apps/activities/templates/meinberlin_activities/includes/activity_detail_content.html
diff --git a/meinberlin/apps/activities/views.py b/meinberlin/apps/activities/views.py
diff --git a/meinberlin/apps/offlineevents/templatetags/offlineevent_tags.py b/meinberlin/apps/offlineevents/templatetags/offlineevent_tags.py
@@ -4,7 +4,6 @@
 
 from adhocracy4.modules.models import Module
 from adhocracy4.phases.models import Phase
-from meinberlin.apps.activities.models import Activity
 from meinberlin.apps.offlineevents.models import OfflineEvent
 
 register = template.Library()
@@ -48,16 +47,3 @@ def is_module(obj):
 @register.filter
 def is_offlineevent(obj):
     return isinstance(obj, OfflineEvent)
-
-
-@register.filter
-def has_activity(obj):
-    try:
-        return isinstance(obj.item_set.first().activity, Activity)
-    except AttributeError:
-        try:
-            return isinstance(
-                obj.future_phases.first().module.item_set.first().activity, Activity
-            )
-        except AttributeError:
-            return isinstance(obj, Activity)
diff --git a/meinberlin/test/factories/activities.py b/meinberlin/test/factories/activities.py
diff --git a/tests/activities/test_activity_component.py b/tests/activities/test_activity_component.py
diff --git a/tests/activities/test_activity_model.py b/tests/activities/test_activity_model.py
diff --git a/tests/activities/test_activity_view.py b/tests/activities/test_activity_view.py