Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

Commit

Permalink
MEI-7607 Reivew redirect to decobo and sso enable field additions (#73)
Browse files Browse the repository at this point in the history
* MEI-7607 MEI-7616 custom field added for docebo
  • Loading branch information
sohaibaslam authored May 5, 2021
1 parent c76b0fc commit 9071b44
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 5 deletions.
28 changes: 28 additions & 0 deletions edx_solutions_organizations/migrations/0010_auto_20210505_0754.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
3 changes: 3 additions & 0 deletions edx_solutions_organizations/models.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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='{}')
Expand Down
10 changes: 6 additions & 4 deletions edx_solutions_organizations/serializers.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand All @@ -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',)


Expand All @@ -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):
Expand All @@ -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):
Expand Down
Empty file modified edx_solutions_organizations/views.py
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 9071b44

Please sign in to comment.