Merge pull request #17808 from edx/douglashall/ENT-936

ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration.

common/djangoapps/third_party_auth/migrations/0017_auto_20180327_1631.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('third_party_auth', '0016_auto_20180130_0938'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ltiproviderconfig',
+            name='send_welcome_email',
+            field=models.BooleanField(default=False, help_text='If this option is selected, users will be sent a welcome email upon registration.'),
+        ),
+        migrations.AddField(
+            model_name='oauth2providerconfig',
+            name='send_welcome_email',
+            field=models.BooleanField(default=False, help_text='If this option is selected, users will be sent a welcome email upon registration.'),
+        ),
+        migrations.AddField(
+            model_name='samlproviderconfig',
+            name='send_welcome_email',
+            field=models.BooleanField(default=False, help_text='If this option is selected, users will be sent a welcome email upon registration.'),
+        ),
+    ]

common/djangoapps/third_party_auth/models.py

@@ -147,6 +147,12 @@ class ProviderConfig(ConfigurationModel):
             "email, and their account will be activated immediately upon registration."
         ),
     )
+    send_welcome_email = models.BooleanField(
+        default=False,
+        help_text=_(
+            "If this option is selected, users will be sent a welcome email upon registration."
+        ),
+    )
     visible = models.BooleanField(
         default=False,
         help_text=_(