From 6bb0c88c72f660b50e81864e9322b760f193ee02 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Fri, 3 Jan 2020 22:21:50 +0000 Subject: [PATCH] FIX: Migrations --- assets/migrations/0009_auto_20200102_1933.py | 21 ------------------- ...102_2040.py => 0009_auto_20200103_2215.py} | 12 +++++++---- .../0010_assetstatus_display_class.py | 18 ---------------- assets/migrations/0010_auto_20200103_2134.py | 19 ----------------- assets/migrations/0011_auto_20200102_2040.py | 18 ---------------- assets/models.py | 2 +- 6 files changed, 9 insertions(+), 81 deletions(-) delete mode 100644 assets/migrations/0009_auto_20200102_1933.py rename assets/migrations/{0009_auto_20200102_1933_squashed_0011_auto_20200102_2040.py => 0009_auto_20200103_2215.py} (57%) delete mode 100644 assets/migrations/0010_assetstatus_display_class.py delete mode 100644 assets/migrations/0010_auto_20200103_2134.py delete mode 100644 assets/migrations/0011_auto_20200102_2040.py diff --git a/assets/migrations/0009_auto_20200102_1933.py b/assets/migrations/0009_auto_20200102_1933.py deleted file mode 100644 index 57f745a1..00000000 --- a/assets/migrations/0009_auto_20200102_1933.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.0.13 on 2020-01-02 19:33 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0008_auto_20191206_2124'), - ] - - operations = [ - migrations.AlterModelOptions( - name='assetcategory', - options={'ordering': ['name'], 'verbose_name': 'Asset Category', 'verbose_name_plural': 'Asset Categories'}, - ), - migrations.AlterModelOptions( - name='assetstatus', - options={'ordering': ['name'], 'verbose_name': 'Asset Status', 'verbose_name_plural': 'Asset Statuses'}, - ), - ] diff --git a/assets/migrations/0009_auto_20200102_1933_squashed_0011_auto_20200102_2040.py b/assets/migrations/0009_auto_20200103_2215.py similarity index 57% rename from assets/migrations/0009_auto_20200102_1933_squashed_0011_auto_20200102_2040.py rename to assets/migrations/0009_auto_20200103_2215.py index 649c419c..5408db0e 100644 --- a/assets/migrations/0009_auto_20200102_1933_squashed_0011_auto_20200102_2040.py +++ b/assets/migrations/0009_auto_20200103_2215.py @@ -1,12 +1,11 @@ -# Generated by Django 2.0.13 on 2020-01-02 20:42 +# Generated by Django 2.0.13 on 2020-01-03 22:15 from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): - replaces = [('assets', '0009_auto_20200102_1933'), ('assets', '0010_assetstatus_display_class'), ('assets', '0011_auto_20200102_2040')] - dependencies = [ ('assets', '0008_auto_20191206_2124'), ] @@ -23,6 +22,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='assetstatus', name='display_class', - field=models.CharField(help_text='HTML class to be appended to alter display of assets with this status, such as in the list.', max_length=80), + field=models.CharField(blank=True, help_text='HTML class to be appended to alter display of assets with this status, such as in the list.', max_length=80, null=True), + ), + migrations.AlterField( + model_name='asset', + name='purchased_from', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='assets.Supplier'), ), ] diff --git a/assets/migrations/0010_assetstatus_display_class.py b/assets/migrations/0010_assetstatus_display_class.py deleted file mode 100644 index f2521ea0..00000000 --- a/assets/migrations/0010_assetstatus_display_class.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.0.13 on 2020-01-02 19:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0009_auto_20200102_1933'), - ] - - operations = [ - migrations.AddField( - model_name='assetstatus', - name='display_class', - field=models.TextField(default='', help_text='HTML class to be appended to alter display of assets with this status, such as in the list.'), - ), - ] diff --git a/assets/migrations/0010_auto_20200103_2134.py b/assets/migrations/0010_auto_20200103_2134.py deleted file mode 100644 index 91d2a131..00000000 --- a/assets/migrations/0010_auto_20200103_2134.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.0.13 on 2020-01-03 21:34 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0009_auto_20200102_1933_squashed_0011_auto_20200102_2040'), - ] - - operations = [ - migrations.AlterField( - model_name='asset', - name='purchased_from', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='assets.Supplier'), - ), - ] diff --git a/assets/migrations/0011_auto_20200102_2040.py b/assets/migrations/0011_auto_20200102_2040.py deleted file mode 100644 index d89aa0ad..00000000 --- a/assets/migrations/0011_auto_20200102_2040.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.0.13 on 2020-01-02 20:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0010_assetstatus_display_class'), - ] - - operations = [ - migrations.AlterField( - model_name='assetstatus', - name='display_class', - field=models.CharField(help_text='HTML class to be appended to alter display of assets with this status, such as in the list.', max_length=80), - ), - ] diff --git a/assets/models.py b/assets/models.py index f152a39a..122fdcb2 100644 --- a/assets/models.py +++ b/assets/models.py @@ -33,7 +33,7 @@ class AssetStatus(models.Model): name = models.CharField(max_length=80) should_show = models.BooleanField( default=True, help_text="Should this be shown by default in the asset list.") - display_class = models.CharField(max_length=80, help_text="HTML class to be appended to alter display of assets with this status, such as in the list.") + display_class = models.CharField(max_length=80, blank=True, null=True, help_text="HTML class to be appended to alter display of assets with this status, such as in the list.") def __str__(self): return self.name