diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 86ef51c3cd..0305d32abb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,10 @@ Change Log Unreleased ---------- +[4.11.0] +--------- +* Added the ability for enterprise customers to enable/disable academies. + [4.10.11] --------- * fix: add missing comma to catalog query fields list. diff --git a/enterprise/__init__.py b/enterprise/__init__.py index b2fa7a38e1..f2d38d70bf 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.10.11" +__version__ = "4.11.0" diff --git a/enterprise/admin/__init__.py b/enterprise/admin/__init__.py index df241caaf4..2d88a33dd1 100644 --- a/enterprise/admin/__init__.py +++ b/enterprise/admin/__init__.py @@ -214,7 +214,7 @@ class EnterpriseCustomerAdmin(DjangoObjectActions, SimpleHistoryAdmin): 'enable_executive_education_2U_fulfillment', 'enable_career_engagement_network_on_learner_portal', 'career_engagement_network_message', 'enable_pathways', 'enable_programs', - 'enable_demo_data_for_analytics_and_lpr'), + 'enable_demo_data_for_analytics_and_lpr', 'enable_academies'), 'description': ('The following default settings should be the same for ' 'the majority of enterprise customers, ' 'and are either rarely used, unlikely to be sold, ' diff --git a/enterprise/api/v1/serializers.py b/enterprise/api/v1/serializers.py index d991cc445b..0c171d32a3 100644 --- a/enterprise/api/v1/serializers.py +++ b/enterprise/api/v1/serializers.py @@ -222,7 +222,7 @@ class Meta: 'enterprise_customer_catalogs', 'reply_to', 'enterprise_notification_banner', 'hide_labor_market_data', 'modified', 'enable_universal_link', 'enable_browse_and_request', 'admin_users', 'enable_career_engagement_network_on_learner_portal', 'career_engagement_network_message', - 'enable_pathways', 'enable_programs', 'enable_demo_data_for_analytics_and_lpr', + 'enable_pathways', 'enable_programs', 'enable_demo_data_for_analytics_and_lpr', 'enable_academies', ) identity_providers = EnterpriseCustomerIdentityProviderSerializer(many=True, read_only=True) diff --git a/enterprise/migrations/0199_auto_20240130_0628.py b/enterprise/migrations/0199_auto_20240130_0628.py new file mode 100644 index 0000000000..7247fbdda3 --- /dev/null +++ b/enterprise/migrations/0199_auto_20240130_0628.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.23 on 2024-01-30 06:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enterprise', '0198_alter_enterprisecourseenrollment_options'), + ] + + operations = [ + migrations.AddField( + model_name='enterprisecustomer', + name='enable_academies', + field=models.BooleanField(default=False, help_text='If checked, the learners will be able to see the academies on the learner portal dashboard.', verbose_name='Display academies screen'), + ), + migrations.AddField( + model_name='historicalenterprisecustomer', + name='enable_academies', + field=models.BooleanField(default=False, help_text='If checked, the learners will be able to see the academies on the learner portal dashboard.', verbose_name='Display academies screen'), + ), + ] diff --git a/enterprise/models.py b/enterprise/models.py index 6c2bfec1ca..543283976d 100644 --- a/enterprise/models.py +++ b/enterprise/models.py @@ -396,6 +396,14 @@ class Meta: ) ) + enable_academies = models.BooleanField( + verbose_name="Display academies screen", + default=False, + help_text=_( + "If checked, the learners will be able to see the academies on the learner portal dashboard." + ) + ) + enable_analytics_screen = models.BooleanField( verbose_name="Display analytics page", default=True,