From 5264f816f1484f7fbc10300af11cfd03bf3b2010 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 2 Feb 2020 21:40:03 +1100 Subject: [PATCH] Allow PartCategory and StocKLocation names to be non-unique - As long as they are unique in the current tree level --- InvenTree/InvenTree/models.py | 3 ++- .../migrations/0027_auto_20200202_1024.py | 19 +++++++++++++++++++ .../migrations/0019_auto_20200202_1024.py | 19 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 InvenTree/part/migrations/0027_auto_20200202_1024.py create mode 100644 InvenTree/stock/migrations/0019_auto_20200202_1024.py diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py index d5259b2acc..a60935b4b6 100644 --- a/InvenTree/InvenTree/models.py +++ b/InvenTree/InvenTree/models.py @@ -29,6 +29,8 @@ class InvenTreeTree(MPTTModel): class Meta: abstract = True + + # Names must be unique at any given level in the tree unique_together = ('name', 'parent') class MPTTMeta: @@ -37,7 +39,6 @@ class InvenTreeTree(MPTTModel): name = models.CharField( blank=False, max_length=100, - unique=True, validators=[validate_tree_name] ) diff --git a/InvenTree/part/migrations/0027_auto_20200202_1024.py b/InvenTree/part/migrations/0027_auto_20200202_1024.py new file mode 100644 index 0000000000..61def4af5e --- /dev/null +++ b/InvenTree/part/migrations/0027_auto_20200202_1024.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.9 on 2020-02-02 10:24 + +import InvenTree.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('part', '0026_auto_20200131_1022'), + ] + + operations = [ + migrations.AlterField( + model_name='partcategory', + name='name', + field=models.CharField(max_length=100, validators=[InvenTree.validators.validate_tree_name]), + ), + ] diff --git a/InvenTree/stock/migrations/0019_auto_20200202_1024.py b/InvenTree/stock/migrations/0019_auto_20200202_1024.py new file mode 100644 index 0000000000..8dc67afb61 --- /dev/null +++ b/InvenTree/stock/migrations/0019_auto_20200202_1024.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.9 on 2020-02-02 10:24 + +import InvenTree.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('stock', '0018_auto_20200202_0103'), + ] + + operations = [ + migrations.AlterField( + model_name='stocklocation', + name='name', + field=models.CharField(max_length=100, validators=[InvenTree.validators.validate_tree_name]), + ), + ]