From 0add82b6f0fc7549ed356d343b108b4f08c4debc Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 4 Dec 2017 12:32:39 +0100 Subject: [PATCH 1/3] a2_rbac: add a validate_emails flag to OU model (#19716) --- .../0015_organizationalunit_validate_emails.py | 19 +++++++++++++++++++ src/authentic2/a2_rbac/models.py | 5 +++++ src/authentic2/manager/forms.py | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py diff --git a/src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py b/src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py new file mode 100644 index 0000000..66f14a4 --- /dev/null +++ b/src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('a2_rbac', '0014_auto_20170711_1024'), + ] + + operations = [ + migrations.AddField( + model_name='organizationalunit', + name='validate_emails', + field=models.BooleanField(default=False, verbose_name='Validate emails'), + ), + ] diff --git a/src/authentic2/a2_rbac/models.py b/src/authentic2/a2_rbac/models.py index 8406e0d..5acd33f 100644 --- a/src/authentic2/a2_rbac/models.py +++ b/src/authentic2/a2_rbac/models.py @@ -35,6 +35,11 @@ class OrganizationalUnit(OrganizationalUnitAbstractBase): default = fields.UniqueBooleanField( verbose_name=_('Default organizational unit')) + validate_emails = models.BooleanField( + blank=True, + default=False, + verbose_name=_('Validate emails')) + admin_perms = GenericRelation(rbac_utils.get_permission_model_name(), content_type_field='target_ct', object_id_field='target_id') diff --git a/src/authentic2/manager/forms.py b/src/authentic2/manager/forms.py index 93aacc5..d78b7c3 100644 --- a/src/authentic2/manager/forms.py +++ b/src/authentic2/manager/forms.py @@ -622,7 +622,7 @@ class OUEditForm(SlugMixin, CssClass, forms.ModelForm): class Meta: model = get_ou_model() - fields = ('name', 'default', 'username_is_unique', 'email_is_unique') + fields = ('name', 'default', 'username_is_unique', 'email_is_unique', 'validate_emails') def get_role_form_class(): -- 2.1.4