From 73e18f26b33a542e2901f1bf2376cdc38255dc0a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 16 Feb 2023 11:59:21 -0500 Subject: [PATCH] Update & merge migrations --- .../migrations/0169_device_configtemplate.py | 20 ------------------- ...fig_template.py => 0170_configtemplate.py} | 9 ++++++--- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 netbox/dcim/migrations/0169_device_configtemplate.py rename netbox/dcim/migrations/{0170_devicerole_config_template.py => 0170_configtemplate.py} (60%) diff --git a/netbox/dcim/migrations/0169_device_configtemplate.py b/netbox/dcim/migrations/0169_device_configtemplate.py deleted file mode 100644 index 7fd80e2b5..000000000 --- a/netbox/dcim/migrations/0169_device_configtemplate.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.1.6 on 2023-02-10 14:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('extras', '0086_configtemplate'), - ('dcim', '0168_interface_template_enabled'), - ] - - operations = [ - migrations.AddField( - model_name='device', - name='config_template', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='extras.configtemplate'), - ), - ] diff --git a/netbox/dcim/migrations/0170_devicerole_config_template.py b/netbox/dcim/migrations/0170_configtemplate.py similarity index 60% rename from netbox/dcim/migrations/0170_devicerole_config_template.py rename to netbox/dcim/migrations/0170_configtemplate.py index 95975f3b4..de48ffd37 100644 --- a/netbox/dcim/migrations/0170_devicerole_config_template.py +++ b/netbox/dcim/migrations/0170_configtemplate.py @@ -1,5 +1,3 @@ -# Generated by Django 4.1.6 on 2023-02-12 20:41 - from django.db import migrations, models import django.db.models.deletion @@ -8,10 +6,15 @@ class Migration(migrations.Migration): dependencies = [ ('extras', '0086_configtemplate'), - ('dcim', '0169_device_configtemplate'), + ('dcim', '0169_devicetype_default_platform'), ] operations = [ + migrations.AddField( + model_name='device', + name='config_template', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='extras.configtemplate'), + ), migrations.AddField( model_name='devicerole', name='config_template',