diff --git a/bluebottle/members/admin.py b/bluebottle/members/admin.py index f331cf0178..e3e2aacd5c 100644 --- a/bluebottle/members/admin.py +++ b/bluebottle/members/admin.py @@ -153,7 +153,7 @@ def impact_hours_info(self, obj): _('Profile'), { 'fields': ( - 'enable_gender', 'enable_birthdate', 'enable_segments', + 'enable_gender', 'enable_birthdate', 'enable_address', 'create_segments' ) } diff --git a/bluebottle/members/migrations/0085_auto_20250203_1201.py b/bluebottle/members/migrations/0085_auto_20250203_1201.py new file mode 100644 index 0000000000..d788e53c0e --- /dev/null +++ b/bluebottle/members/migrations/0085_auto_20250203_1201.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.20 on 2025-02-03 11:01 + +import bluebottle.bb_accounts.models +import bluebottle.files.fields +import bluebottle.utils.validators +from django.db import migrations, models +import django.db.models.deletion +import multiselectfield.db.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('files', '0012_auto_20250113_1704'), + ('offices', '0004_add_permissions_20230130_1255'), + ('members', '0084_merge_20250109_0820'), + ] + + operations = [ + migrations.RemoveField( + model_name='memberplatformsettings', + name='enable_segments', + ), + ] diff --git a/bluebottle/members/models.py b/bluebottle/members/models.py index 9cc5529ab2..8703a8b4a6 100644 --- a/bluebottle/members/models.py +++ b/bluebottle/members/models.py @@ -152,12 +152,6 @@ class MemberPlatformSettings(BasePlatformSettings): help_text=_('Show address question in profile form') ) - enable_segments = models.BooleanField( - _('email segments'), - default=False, - help_text=_('Enable segments for users e.g. department or job title.') - ) - create_segments = models.BooleanField( _('create segments'), default=False, diff --git a/bluebottle/settings/admin_dashboard.py b/bluebottle/settings/admin_dashboard.py index ca74b6dedd..3988475148 100644 --- a/bluebottle/settings/admin_dashboard.py +++ b/bluebottle/settings/admin_dashboard.py @@ -137,7 +137,6 @@ "label": _("Segments"), "app_label": "segments", "permissions": ["segments.change_segmenttype"], - "enabled": "members.MemberPlatformSettings.enable_segments", "items": [ { "label": _("All segment types"), diff --git a/bluebottle/token_auth/tests/test_saml.py b/bluebottle/token_auth/tests/test_saml.py index 223018831e..0f84598c77 100644 --- a/bluebottle/token_auth/tests/test_saml.py +++ b/bluebottle/token_auth/tests/test_saml.py @@ -361,7 +361,6 @@ def test_auth_existing_with_office_name(self): def test_auth_existing_with_segment(self): member_settings = MemberPlatformSettings.load() - member_settings.enable_segments = True member_settings.create_segments = True member_settings.save() @@ -402,7 +401,6 @@ def test_auth_existing_with_segment(self): def test_auth_existing_with_segment_slug(self): member_settings = MemberPlatformSettings.load() - member_settings.enable_segments = True member_settings.create_segments = True member_settings.save() @@ -442,7 +440,6 @@ def test_auth_existing_with_office_and_segment(self): LocationFactory.create(slug='user', name='User Office') member_settings = MemberPlatformSettings.load() - member_settings.enable_segments = True member_settings.create_segments = True member_settings.save() SegmentTypeFactory.create(slug='function', name='Function')