From 9071b443f8e9784af3a11ba025321e541f6ebdf9 Mon Sep 17 00:00:00 2001 From: Sohaib Aslam Date: Wed, 5 May 2021 13:53:40 +0500 Subject: [PATCH] MEI-7607 Reivew redirect to decobo and sso enable field additions (#73) * MEI-7607 MEI-7616 custom field added for docebo --- .../migrations/0010_auto_20210505_0754.py | 28 +++++++++++++++++++ edx_solutions_organizations/models.py | 3 ++ edx_solutions_organizations/serializers.py | 10 ++++--- edx_solutions_organizations/views.py | 0 setup.py | 2 +- 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 edx_solutions_organizations/migrations/0010_auto_20210505_0754.py mode change 100644 => 100755 edx_solutions_organizations/models.py mode change 100644 => 100755 edx_solutions_organizations/serializers.py mode change 100644 => 100755 edx_solutions_organizations/views.py diff --git a/edx_solutions_organizations/migrations/0010_auto_20210505_0754.py b/edx_solutions_organizations/migrations/0010_auto_20210505_0754.py new file mode 100644 index 0000000..1fdfca0 --- /dev/null +++ b/edx_solutions_organizations/migrations/0010_auto_20210505_0754.py @@ -0,0 +1,28 @@ +# Generated by Django 2.2.16 on 2021-05-05 07:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('edx_solutions_organizations', '0009_auto_20201224_0826'), + ] + + operations = [ + migrations.AddField( + model_name='organization', + name='docebo_redirect_url', + field=models.URLField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='organization', + name='docebo_sso_enabled', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='organization', + name='migrated_to_docebo', + field=models.BooleanField(default=False), + ), + ] diff --git a/edx_solutions_organizations/models.py b/edx_solutions_organizations/models.py old mode 100644 new mode 100755 index 81615b2..b941478 --- a/edx_solutions_organizations/models.py +++ b/edx_solutions_organizations/models.py @@ -28,6 +28,9 @@ class Organization(TimeStampedModel): # could be different for each organization attributes = models.TextField(default='{}') include_manager_info = models.BooleanField(default=False) + migrated_to_docebo = models.BooleanField(default=False) + docebo_sso_enabled = models.BooleanField(default=False) + docebo_redirect_url = models.URLField(max_length=255, null=True, blank=True) salesforce_id = models.TextField(null=True, blank=True) # JSON to hold any additional metadata related to an organization additional_metadata = models.TextField(default='{}') diff --git a/edx_solutions_organizations/serializers.py b/edx_solutions_organizations/serializers.py old mode 100644 new mode 100755 index c568175..cc394ab --- a/edx_solutions_organizations/serializers.py +++ b/edx_solutions_organizations/serializers.py @@ -13,7 +13,8 @@ class Meta: """ Serializer/field specification """ model = Organization fields = ('url', 'id', 'name', 'display_name', 'contact_name', 'contact_email', 'contact_phone', - 'logo_url', 'users', 'groups', 'created', 'modified', 'salesforce_id', 'additional_metadata',) + 'logo_url', 'users', 'groups', 'created', 'modified', 'salesforce_id', 'additional_metadata', + 'migrated_to_docebo', 'docebo_redirect_url', 'docebo_sso_enabled',) read_only = ('url', 'id', 'created') extra_kwargs = {'users': {'allow_empty': True}, 'groups': {'allow_empty': True}} @@ -26,7 +27,8 @@ class Meta: """ Serializer/field specification """ model = Organization fields = ('url', 'id', 'name', 'display_name', 'contact_name', 'contact_email', 'contact_phone', - 'logo_url', 'created', 'modified', 'salesforce_id', 'additional_metadata',) + 'logo_url', 'created', 'modified', 'salesforce_id', 'additional_metadata', 'migrated_to_docebo', + 'docebo_redirect_url', 'docebo_sso_enabled',) read_only = ('url', 'id', 'created',) @@ -40,7 +42,7 @@ class Meta: model = Organization fields = ('url', 'id', 'name', 'display_name', 'number_of_courses', 'contact_name', 'contact_email', 'contact_phone', 'logo_url', 'created', 'modified', 'number_of_participants', 'salesforce_id', - 'additional_metadata',) + 'additional_metadata', 'migrated_to_docebo', 'docebo_redirect_url', 'docebo_sso_enabled',) class OrganizationWithParticipantCountSerializer(BasicOrganizationSerializer): @@ -52,7 +54,7 @@ class Meta: model = Organization fields = ('url', 'id', 'name', 'display_name', 'contact_name', 'contact_email', 'contact_phone', 'logo_url', 'created', 'modified', 'number_of_participants', 'salesforce_id', - 'additional_metadata',) + 'additional_metadata', 'migrated_to_docebo', 'docebo_redirect_url', 'docebo_sso_enabled',) class OrganizationAttributesSerializer(serializers.ModelSerializer): diff --git a/edx_solutions_organizations/views.py b/edx_solutions_organizations/views.py old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index f7a60b0..0f53c33 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='organizations-edx-platform-extensions', - version='3.0.0', + version='3.0.1', description='Organization management extension for edX platform', long_description=open('README.rst').read(), author='edX',