From 2264937f815acef7500a79796b70482cb33a15d3 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 11 Jul 2022 17:11:58 -0400
Subject: [PATCH] Consolidate custom field migrations

---
 ..._name.py => 0074_customfield_extensions.py} |  5 +++++
 ...ions.py => 0075_configcontext_locations.py} |  2 +-
 .../0075_customfield_ui_visibility.py          | 18 ------------------
 netbox/ipam/migrations/0059_l2vpn.py           |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)
 rename netbox/extras/migrations/{0074_customfield_group_name.py => 0074_customfield_extensions.py} (75%)
 rename netbox/extras/migrations/{0076_configcontext_locations.py => 0075_configcontext_locations.py} (88%)
 delete mode 100644 netbox/extras/migrations/0075_customfield_ui_visibility.py

diff --git a/netbox/extras/migrations/0074_customfield_group_name.py b/netbox/extras/migrations/0074_customfield_extensions.py
similarity index 75%
rename from netbox/extras/migrations/0074_customfield_group_name.py
rename to netbox/extras/migrations/0074_customfield_extensions.py
index e1be76b1f..6ca8b958f 100644
--- a/netbox/extras/migrations/0074_customfield_group_name.py
+++ b/netbox/extras/migrations/0074_customfield_extensions.py
@@ -19,4 +19,9 @@ class Migration(migrations.Migration):
             name='group_name',
             field=models.CharField(blank=True, max_length=50),
         ),
+        migrations.AddField(
+            model_name='customfield',
+            name='ui_visibility',
+            field=models.CharField(default='read-write', max_length=50),
+        ),
     ]
diff --git a/netbox/extras/migrations/0076_configcontext_locations.py b/netbox/extras/migrations/0075_configcontext_locations.py
similarity index 88%
rename from netbox/extras/migrations/0076_configcontext_locations.py
rename to netbox/extras/migrations/0075_configcontext_locations.py
index f9b3a664b..853aec4f7 100644
--- a/netbox/extras/migrations/0076_configcontext_locations.py
+++ b/netbox/extras/migrations/0075_configcontext_locations.py
@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('dcim', '0156_location_status'),
-        ('extras', '0075_customfield_ui_visibility'),
+        ('extras', '0074_customfield_extensions'),
     ]
 
     operations = [
diff --git a/netbox/extras/migrations/0075_customfield_ui_visibility.py b/netbox/extras/migrations/0075_customfield_ui_visibility.py
deleted file mode 100644
index 29ee65516..000000000
--- a/netbox/extras/migrations/0075_customfield_ui_visibility.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.0.4 on 2022-05-23 20:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('extras', '0074_customfield_group_name'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='customfield',
-            name='ui_visibility',
-            field=models.CharField(default='read-write', max_length=50),
-        ),
-    ]
diff --git a/netbox/ipam/migrations/0059_l2vpn.py b/netbox/ipam/migrations/0059_l2vpn.py
index 5662049c3..ef670ddea 100644
--- a/netbox/ipam/migrations/0059_l2vpn.py
+++ b/netbox/ipam/migrations/0059_l2vpn.py
@@ -9,7 +9,7 @@ import taggit.managers
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('extras', '0076_configcontext_locations'),
+        ('extras', '0075_configcontext_locations'),
         ('contenttypes', '0002_remove_content_type_name'),
         ('tenancy', '0007_contact_link'),
         ('ipam', '0058_ipaddress_nat_inside_nonunique'),