From 040ee1d8f739561a1814e7ad092a3649f0085312 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Fri, 4 Apr 2025 20:33:07 +0000 Subject: [PATCH] Join migrations --- ...6_configtemplate_as_attachment_and_more.py} | 9 +++++++-- .../0126_exporttemplate_environment_params.py | 18 ------------------ 2 files changed, 7 insertions(+), 20 deletions(-) rename netbox/extras/migrations/{0127_configtemplate_as_attachment_and_more.py => 0126_configtemplate_as_attachment_and_more.py} (73%) delete mode 100644 netbox/extras/migrations/0126_exporttemplate_environment_params.py diff --git a/netbox/extras/migrations/0127_configtemplate_as_attachment_and_more.py b/netbox/extras/migrations/0126_configtemplate_as_attachment_and_more.py similarity index 73% rename from netbox/extras/migrations/0127_configtemplate_as_attachment_and_more.py rename to netbox/extras/migrations/0126_configtemplate_as_attachment_and_more.py index 967b14c3d..6d5aad62e 100644 --- a/netbox/extras/migrations/0127_configtemplate_as_attachment_and_more.py +++ b/netbox/extras/migrations/0126_configtemplate_as_attachment_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2b1 on 2025-04-04 00:58 +# Generated by Django 5.2b1 on 2025-04-04 20:25 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('extras', '0126_exporttemplate_environment_params'), + ('extras', '0125_exporttemplate_file_name'), ] operations = [ @@ -30,4 +30,9 @@ class Migration(migrations.Migration): name='mime_type', field=models.CharField(blank=True, max_length=50), ), + migrations.AddField( + model_name='exporttemplate', + name='environment_params', + field=models.JSONField(blank=True, default=dict, null=True), + ), ] diff --git a/netbox/extras/migrations/0126_exporttemplate_environment_params.py b/netbox/extras/migrations/0126_exporttemplate_environment_params.py deleted file mode 100644 index dce32a950..000000000 --- a/netbox/extras/migrations/0126_exporttemplate_environment_params.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.2b1 on 2025-04-03 01:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('extras', '0125_exporttemplate_file_name'), - ] - - operations = [ - migrations.AddField( - model_name='exporttemplate', - name='environment_params', - field=models.JSONField(blank=True, default=dict, null=True), - ), - ]