Ticket #33151: 33151.diff

django/contrib/auth/management/commands/createsuperuser.py

@@ -11 +11 @@
 from django.core import exceptions
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS
+from django.db.models import Model
 from django.utils.text import capfirst
 
 
@@ -184 +185 @@
                     if not value:
                         raise CommandError('You must use --%s with --noinput.' % field_name)
                     field = self.UserModel._meta.get_field(field_name)
-                    user_data[field_name] = field.clean(value, None)
+                    if field.many_to_one:
+                        field_model = field.remote_field.model._meta.concrete_model
+                        if isinstance(value, field_model):
+                            user_data[field_name] = field.clean(value, None)
+                        else:
+                            try:
+                                user_data[field_name] = field_model.objects.get(pk=field.clean(value, None))
+                            except field_model.DoesNotExist:
+                                raise CommandError(
+                                    'No record of %s was found with primary key %s' % (field_model.name, value)
+                                )
+                    else:
+                        user_data[field_name] = field.clean(value, None)
 
             self.UserModel._default_manager.db_manager(database).create_superuser(**user_data)
             if options['verbosity'] >= 1: