test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #33151 -- Fixed createsuperuser crash for many-to-many required fields in non-interactive mode.

This commit is contained in:
Christophe Henry 2021-10-07 12:00:47 +02:00 committed by Mariusz Felisiak
parent 9be36f8044
commit df2d2bc95c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/management/commands/createsuperuser.py
View File

@ -185,6 +185,10 @@ class Command(BaseCommand):
raise CommandError('You must use --%s with --noinput.' % field_name) raise CommandError('You must use --%s with --noinput.' % field_name)
field = self.UserModel._meta.get_field(field_name) field = self.UserModel._meta.get_field(field_name)
user_data[field_name] = field.clean(value, None) user_data[field_name] = field.clean(value, None)
if field.many_to_many and isinstance(user_data[field_name], str):
user_data[field_name] = [
pk.strip() for pk in user_data[field_name].split(',')
]
self.UserModel._default_manager.db_manager(database).create_superuser(**user_data) self.UserModel._default_manager.db_manager(database).create_superuser(**user_data)
if options['verbosity'] >= 1: if options['verbosity'] >= 1:

19
tests/auth_tests/test_management.py
View File

@ -994,6 +994,25 @@ class CreatesuperuserManagementCommandTestCase(TestCase):
# Environment variables are ignored for non-required fields. # Environment variables are ignored for non-required fields.
self.assertEqual(user.first_name, '') self.assertEqual(user.first_name, '')
@override_settings(AUTH_USER_MODEL='auth_tests.CustomUserWithM2m')
def test_environment_variable_m2m_non_interactive(self):
new_io = StringIO()
org_id_1 = Organization.objects.create(name='Organization 1').pk
org_id_2 = Organization.objects.create(name='Organization 2').pk
with mock.patch.dict(os.environ, {
'DJANGO_SUPERUSER_ORGS': f'{org_id_1},{org_id_2}',
}):
call_command(
'createsuperuser',
interactive=False,
username='joe',
stdout=new_io,
)
command_output = new_io.getvalue().strip()
self.assertEqual(command_output, 'Superuser created successfully.')
user = CustomUserWithM2M._default_manager.get(username='joe')
self.assertEqual(user.orgs.count(), 2)
@mock.patch.dict(os.environ, { @mock.patch.dict(os.environ, {
'DJANGO_SUPERUSER_USERNAME': 'test_superuser', 'DJANGO_SUPERUSER_USERNAME': 'test_superuser',
'DJANGO_SUPERUSER_EMAIL': 'joe@somewhere.org', 'DJANGO_SUPERUSER_EMAIL': 'joe@somewhere.org',