From 5cdaaed311d605b91278fd3404a67fe12b7d0067 Mon Sep 17 00:00:00 2001 From: Jonathan Senecal Date: Wed, 10 Jun 2020 14:04:55 -0400 Subject: [PATCH] Use a single migration for `labels` --- ...port_label.py => 0107_component_labels.py} | 14 +++++++++-- .../dcim/migrations/0107_interface_label.py | 23 ------------------- 2 files changed, 12 insertions(+), 25 deletions(-) rename netbox/dcim/migrations/{0108_port_label.py => 0107_component_labels.py} (77%) delete mode 100644 netbox/dcim/migrations/0107_interface_label.py diff --git a/netbox/dcim/migrations/0108_port_label.py b/netbox/dcim/migrations/0107_component_labels.py similarity index 77% rename from netbox/dcim/migrations/0108_port_label.py rename to netbox/dcim/migrations/0107_component_labels.py index af0aa1962..9aa496134 100644 --- a/netbox/dcim/migrations/0108_port_label.py +++ b/netbox/dcim/migrations/0107_component_labels.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.7 on 2020-06-05 14:32 +# Generated by Django 3.0.7 on 2020-06-04 20:37 from django.db import migrations, models @@ -6,10 +6,20 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0107_interface_label'), + ('dcim', '0106_role_default_color'), ] operations = [ + migrations.AddField( + model_name='interface', + name='label', + field=models.CharField(blank=True, max_length=64), + ), + migrations.AddField( + model_name='interfacetemplate', + name='label', + field=models.CharField(blank=True, max_length=64), + ), migrations.AddField( model_name='consoleport', name='label', diff --git a/netbox/dcim/migrations/0107_interface_label.py b/netbox/dcim/migrations/0107_interface_label.py deleted file mode 100644 index 48970d25d..000000000 --- a/netbox/dcim/migrations/0107_interface_label.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.7 on 2020-06-04 20:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0106_role_default_color'), - ] - - operations = [ - migrations.AddField( - model_name='interface', - name='label', - field=models.CharField(blank=True, max_length=64), - ), - migrations.AddField( - model_name='interfacetemplate', - name='label', - field=models.CharField(blank=True, max_length=64), - ), - ]