Merge 5d5a926 into 257b464

bluebottle/activities/admin.py

@@ -322,7 +322,6 @@ def save_model(self, request, obj, form, change):
 
     office_fields = (
         'office_location',
-        'office_restriction',
     )
 
     description_fields = (
@@ -430,7 +429,12 @@ def get_fieldsets(self, request, obj=None):
             (_('Description'), {'fields': self.get_description_fields(request, obj)}),
             (_('Status'), {'fields': self.get_status_fields(request, obj)}),
         ]
-        if settings.enable_office_regions:
+
+        if Location.objects.count():
+            if settings.enable_office_restrictions:
+                self.office_fields += (
+                    'office_restriction',
+                )
             fieldsets.insert(1, (
                 _('Office'), {'fields': self.office_fields}
             ))

bluebottle/initiatives/admin.py

@@ -234,7 +234,8 @@ class InitiativePlatformSettingsAdmin(BasePlatformSettingsAdmin):
         (_('Options'), {
             'fields': (
                 'contact_method', 'require_organization',
-                'enable_impact', 'enable_office_regions', 'enable_multiple_dates',
+                'enable_impact', 'enable_office_regions', 'enable_office_restrictions',
+                'enable_multiple_dates',
                 'enable_open_initiatives', 'enable_participant_exports',
                 'enable_matching_emails',
             )

bluebottle/initiatives/migrations/0042_auto_20220928_1600.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.24 on 2022-09-28 14:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import multiselectfield.db.fields
+import parler.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('initiatives', '0041_merge_20220906_0704'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='initiativeplatformsettings',
+            name='enable_office_restrictions',
+            field=models.BooleanField(default=False, help_text='Allow activity managers to specify office restrictions on activities.'),
+        ),
+    ]

bluebottle/initiatives/models.py

@@ -300,6 +300,10 @@ class InitiativePlatformSettings(BasePlatformSettings):
         default=False,
         help_text=_("Allow admins to add (sub)regions to their offices.")
     )
+    enable_office_restrictions = models.BooleanField(
+        default=False,
+        help_text=_("Allow activity managers to specify office restrictions on activities.")
+    )
     enable_multiple_dates = models.BooleanField(
         default=False,
         help_text=_("Enable date activities to have multiple slots.")