diff --git a/assets/migrations/0011_asset_nickname.py b/assets/migrations/0011_asset_nickname.py index 9d7bdb45..c0f78947 100644 --- a/assets/migrations/0011_asset_nickname.py +++ b/assets/migrations/0011_asset_nickname.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.13 on 2020-03-02 17:53 +# Generated by Django 2.0.13 on 2020-03-03 19:40 from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='asset', name='nickname', - field=models.CharField(blank=True, max_length=20, unique=True), + field=models.CharField(blank=True, max_length=20, null=True, unique=True), ), ] diff --git a/assets/models.py b/assets/models.py index 51a7c6ed..91fc9455 100644 --- a/assets/models.py +++ b/assets/models.py @@ -82,7 +82,7 @@ class Asset(models.Model, RevisionMixin): category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE) status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE) serial_number = models.CharField(max_length=150, blank=True) - nickname = models.CharField(max_length=20, blank=True, unique=True) + nickname = models.CharField(max_length=20, blank=True, null=True, unique=True) # Null = true required because of the unique constraint purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True, related_name="assets") date_acquired = models.DateField() date_sold = models.DateField(blank=True, null=True)