From e3be769efcea0520a161700bb4ba75f8bcc2274c Mon Sep 17 00:00:00 2001 From: Nikolay Zamotaev Date: Wed, 22 Jul 2020 19:54:16 +0300 Subject: Fix for vendor duplication when changing the user Task-number: AUTOSUITE-1463 Change-Id: Id6c21ad88618513766c5b5de8e75c40c258f8828 Reviewed-by: Egor Nemtsev --- store/migrations/0001_initial.py | 7 ++++--- store/models.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/store/migrations/0001_initial.py b/store/migrations/0001_initial.py index d0e2c04..f23c6bf 100644 --- a/store/migrations/0001_initial.py +++ b/store/migrations/0001_initial.py @@ -31,7 +31,7 @@ ## ############################################################################# -# Generated by Django 1.11.27 on 2020-02-07 16:50 +# Generated by Django 1.11.27 on 2020-07-22 16:39 from __future__ import unicode_literals from django.conf import settings @@ -45,7 +45,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('auth', '0008_alter_user_username_max_length'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -82,9 +82,10 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Vendor', fields=[ - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=200)), ('certificate', models.TextField(max_length=8000)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), migrations.AddField( diff --git a/store/models.py b/store/models.py index 93136af..1cf8916 100644 --- a/store/models.py +++ b/store/models.py @@ -75,7 +75,7 @@ class Category(OrderedModel): super(Category, self).save(*args, **kwargs) class Vendor(models.Model): - user = models.ForeignKey(User, primary_key = True) + user = models.ForeignKey(User, primary_key = False) name = models.CharField(max_length = 200) certificate = models.TextField(max_length = 8000) -- cgit v1.2.3