0001-manager-improve-default-role-form-fields-58699.patch

Valentin Deniaud, 04 octobre 2022 12:20

Voir les différences: en ligne côte à côte

Subject: [PATCH] manager: improve default role form fields (#58699)

 src/authentic2/forms/fields.py         | 52 +++++++++++++++++++++
 src/authentic2/manager/app_settings.py |  1 -
 src/authentic2/manager/forms.py        | 62 ++++++++++++++++++++------
 src/authentic2/manager/role_views.py   |  4 +-
 tests/test_manager.py                  | 24 ++++++++++
 5 files changed, 126 insertions(+), 17 deletions(-)

     import warnings
     import PIL.Image
     from django import forms
     from django.core import validators
     from django.core.files import File
     from django.forms import CharField, EmailField, FileField, ModelChoiceField, ValidationError
     from django.forms.fields import FILE_INPUT_CONTRADICTION
-...
         def label_from_instance(self, obj):
             return label_from_role(obj)
     class ListValidator:
         def __init__(self, item_validator):
             self.item_validator = item_validator
         def __call__(self, value):
             for i, item in enumerate(value):
                 try:
                     self.item_validator(item)
                 except ValidationError as e:
                     raise ValidationError(_('Item {0} is invalid: {1}').format(i, e.args[0]))
     class CommaSeparatedInput(forms.TextInput):
         def format_value(self, value):
             if not value:
                 return ''
             if not isinstance(value, str):
                 return ', '.join(value)
             return value
     class CommaSeparatedCharField(forms.Field):
         widget = CommaSeparatedInput
         def __init__(self, dedup=True, max_length=None, min_length=None, *args, **kwargs):
             self.dedup = dedup
             self.max_length = max_length
             self.min_length = min_length
             item_validators = kwargs.pop('item_validators', [])
             super().__init__(*args, **kwargs)
             for item_validator in item_validators:
                 self.validators.append(ListValidator(item_validator))
         def to_python(self, value):
             if value in validators.EMPTY_VALUES:
                 return []
             value = [item.strip() for item in value.split(',') if item.strip()]
             if self.dedup:
                 value = list(set(value))
             return value
         def clean(self, value):
             value = self.to_python(value)
             self.validate(value)
             self.run_validators(value)
             return value

src/authentic2/manager/app_settings.py
21	21	__PREFIX = 'A2_MANAGER_'
22	22	__DEFAULTS = {
23	23	'HOMEPAGE_URL': None,
24		'ROLE_FORM_CLASS': None,
25	24	'SHOW_ALL_OU': True,
26	25	'ROLE_MEMBERS_FROM_OU': False,
27	26	'SHOW_INTERNAL_ROLES': False,

     from django.utils.translation import ugettext_lazy as _
     from django_select2.forms import HeavySelect2Widget
     from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role
     from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role, RoleAttribute
     from authentic2.a2_rbac.utils import generate_slug, get_default_ou
     from authentic2.forms.fields import CheckPasswordField, NewPasswordField, ValidatedEmailField
     from authentic2.forms.fields import (
         CheckPasswordField,
         CommaSeparatedCharField,
         NewPasswordField,
         ValidatedEmailField,
+    )
     from authentic2.forms.mixins import SlugMixin
     from authentic2.forms.profile import BaseUserForm
     from authentic2.models import APIClient, PasswordReset, Service
     from authentic2.passwords import generate_password
     from authentic2.utils.misc import (
         import_module_or_class,
         send_email_change_email,
         send_password_reset_mail,
         send_templated_mail,
+    )
     from authentic2.utils.misc import send_email_change_email, send_password_reset_mail, send_templated_mail
     from authentic2.validators import EmailValidator
     from django_rbac.backends import DjangoRBACBackend
     from django_rbac.models import Operation
-...
         ou = forms.ModelChoiceField(
             queryset=OrganizationalUnit.objects, required=True, label=_('Organizational unit')
+        )
         details = forms.CharField(
             label=_('Role details (frontoffice)'), widget=forms.Textarea, initial='', required=False
+        )
         emails = CommaSeparatedCharField(
             label=_('Emails'),
             item_validators=[EmailValidator()],
             required=False,
             help_text=_('Emails must be separated by commas.'),
+        )
         emails_to_members = forms.BooleanField(required=False, initial=True, label=_('Emails to members'))
         class Meta:
             model = Role
-...
                 'name': forms.TextInput(),
+            }
         def __init__(self, *args, **kwargs):
             instance = kwargs.get('instance')
             if instance:
                 fields = [x.name for x in Role._meta.get_fields()]
                 initial = kwargs.setdefault('initial', {})
                 role_attributes = RoleAttribute.objects.filter(role=instance, kind='json')
                 for role_attribute in role_attributes:
                     if role_attribute.name in fields:
                         continue
                     initial[role_attribute.name] = json.loads(role_attribute.value)
             super().__init__(*args, **kwargs)
         def save(self, commit=True):
             fields = [x.name for x in Role._meta.get_fields()]
             assert commit
             instance = super().save(commit=commit)
             for field in self.cleaned_data:
                 if field in fields:
                     continue
                 value = json.dumps(self.cleaned_data[field])
                 ra, created = RoleAttribute.objects.get_or_create(
                     role=instance, name=field, kind='json', defaults={'value': value}
+                )
                 if not created and ra.value != value:
                     ra.value = value
                     ra.save()
             instance.save()
             return instance
     class OUEditForm(SlugMixin, CssClass, forms.ModelForm):
         def __init__(self, *args, **kwargs):
-...
+            )
     def get_role_form_class():
         if app_settings.ROLE_FORM_CLASS:
             return import_module_or_class(app_settings.ROLE_FORM_CLASS)
         return RoleEditForm
     # we need a model form so that we can use a BaseEditView, a simple Form
     # would not work
     class UserChangeEmailForm(CssClass, FormWithRequest, forms.ModelForm):

             return initial
         def get_form_class(self):
             form = forms.get_role_form_class()
             form = forms.RoleEditForm
             fields = [x for x in form.base_fields.keys() if x not in self.exclude_fields]
             return modelform_factory(self.model, form=form, fields=fields)
-...
         title = _('Edit role description')
         def get_form_class(self):
             return forms.get_role_form_class()
             return forms.RoleEditForm
         def form_valid(self, form):
             response = super().form_valid(form)

         assert 'New OU' in options
     def test_manager_edit_role(superuser_or_admin, app, simple_role):
         resp = login(app, superuser_or_admin, '/manage/roles/%s/edit/' % simple_role.pk)
         resp.form['details'] = 'xxx'
         resp.form['emails'] = 'test@example.com'
         resp.form['emails_to_members'] = False
         resp = resp.form.submit().follow()
         assert set(simple_role.attributes.values_list('name', 'value')) == {
             ('emails_to_members', 'false'),
             ('emails', '["test@example.com"]'),
             ('details', '"xxx"'),
+        }
         resp = app.get('/manage/roles/%s/edit/' % simple_role.pk)
         resp.form['emails'] = 'test@example.com, hop@example.com'
         resp = resp.form.submit().follow()
         emails = simple_role.attributes.get(name='emails')
         assert set(json.loads(emails.value)) == {'test@example.com', 'hop@example.com'}
         resp = app.get('/manage/roles/%s/edit/' % simple_role.pk)
         resp.form['emails'] = 'xxx'
         resp = resp.form.submit()
         assert 'Item 0 is invalid: Enter a valid email address.' in resp.text
     def test_manager_edit_role_slug(superuser_or_admin, app, simple_role):
         assert Role.objects.get(name='simple role').slug == 'simple-role'
         resp = login(app, superuser_or_admin, reverse('a2-manager-role-edit', kwargs={'pk': simple_role.pk}))
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-manager-improve-default-role-form-fields-58699.patch