summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUriel Corfa <korfuri@gmail.com>2014-06-21 19:37:39 -0700
committerTim Graham <timograham@gmail.com>2014-06-23 13:13:45 -0400
commitbcd2e6c697ee29ab1c1240a6b30281d53329b333 (patch)
tree0095ecf87759a388e153958f78bde5a5f2e0d5a3
parent1c50d6ae2bee31ccf605066186d4d48aaf2de7ea (diff)
Removed 'to_field' from ForeignKey(settings.AUTH_USER_MODEL) in admin's initial migration.
This enables using a custom user model with a primary key with a name different than 'id'; refs #22889.
-rw-r--r--django/contrib/admin/migrations/0001_initial.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/migrations/0001_initial.py b/django/contrib/admin/migrations/0001_initial.py
index e7b3ebecc5..8d46ab1572 100644
--- a/django/contrib/admin/migrations/0001_initial.py
+++ b/django/contrib/admin/migrations/0001_initial.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('action_flag', models.PositiveSmallIntegerField(verbose_name='action flag')),
('change_message', models.TextField(verbose_name='change message', blank=True)),
('content_type', models.ForeignKey(to_field='id', blank=True, to='contenttypes.ContentType', null=True)),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, to_field='id')),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ('-action_time',),