diff options
| author | Uriel Corfa <korfuri@gmail.com> | 2014-06-21 19:37:39 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-23 13:23:09 -0400 |
| commit | 68b89f4d13b69771b232c1fcb0fb598000b6eb98 (patch) | |
| tree | c9325ef3206ff4dbb857f15767c81a44d65ddb5b | |
| parent | 21c959138401bd9f57fd789409c80add01c4b075 (diff) | |
[1.7.x] 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.
Backport of bcd2e6c697 from master
| -rw-r--r-- | django/contrib/admin/migrations/0001_initial.py | 2 |
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',), |