From d1802bff0b43636dc3ac4f440b66774f057adbb8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 15 Nov 2024 08:26:13 -0500 Subject: [PATCH] Clean up migrations --- ...etwork_name.py => 0049_natural_ordering.py} | 4 +--- .../migrations/0197_natural_sort_collation.py | 17 +++++++++++++++++ ...atural_sort.py => 0198_natural_ordering.py} | 10 +--------- ...me_and_more.py => 0076_natural_ordering.py} | 4 +--- .../project-static/src/buttons/launchModal.ts | 18 ++++++++++++++++++ ...me_and_more.py => 0017_natural_ordering.py} | 4 +--- ...ns_and_more.py => 0046_natural_ordering.py} | 4 +--- ...me_and_more.py => 0007_natural_ordering.py} | 4 +--- ...ngroup_name.py => 0012_natural_ordering.py} | 4 +--- 9 files changed, 42 insertions(+), 27 deletions(-) rename netbox/circuits/migrations/{0049_alter_provider_name_alter_providernetwork_name.py => 0049_natural_ordering.py} (87%) create mode 100644 netbox/dcim/migrations/0197_natural_sort_collation.py rename netbox/dcim/migrations/{0197_natural_sort.py => 0198_natural_ordering.py} (97%) rename netbox/ipam/migrations/{0076_alter_asnrange_name_alter_routetarget_name_and_more.py => 0076_natural_ordering.py} (91%) create mode 100644 netbox/project-static/src/buttons/launchModal.ts rename netbox/tenancy/migrations/{0017_alter_contact_name_alter_tenant_name_and_more.py => 0017_natural_ordering.py} (89%) rename netbox/virtualization/migrations/{0046_alter_virtualmachine_options_and_more.py => 0046_natural_ordering.py} (93%) rename netbox/vpn/migrations/{0007_alter_ikepolicy_name_alter_ikeproposal_name_and_more.py => 0007_natural_ordering.py} (94%) rename netbox/wireless/migrations/{0012_alter_wirelesslangroup_name.py => 0012_natural_ordering.py} (82%) diff --git a/netbox/circuits/migrations/0049_alter_provider_name_alter_providernetwork_name.py b/netbox/circuits/migrations/0049_natural_ordering.py similarity index 87% rename from netbox/circuits/migrations/0049_alter_provider_name_alter_providernetwork_name.py rename to netbox/circuits/migrations/0049_natural_ordering.py index ded72ae8f..1b4f565e8 100644 --- a/netbox/circuits/migrations/0049_alter_provider_name_alter_providernetwork_name.py +++ b/netbox/circuits/migrations/0049_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 17:15 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('circuits', '0048_circuitterminations_cached_relations'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ diff --git a/netbox/dcim/migrations/0197_natural_sort_collation.py b/netbox/dcim/migrations/0197_natural_sort_collation.py new file mode 100644 index 000000000..a77632b37 --- /dev/null +++ b/netbox/dcim/migrations/0197_natural_sort_collation.py @@ -0,0 +1,17 @@ +from django.contrib.postgres.operations import CreateCollation +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0196_qinq_svlan'), + ] + + operations = [ + CreateCollation( + "natural_sort", + provider="icu", + locale="und-u-kn-true", + ), + ] diff --git a/netbox/dcim/migrations/0197_natural_sort.py b/netbox/dcim/migrations/0198_natural_ordering.py similarity index 97% rename from netbox/dcim/migrations/0197_natural_sort.py rename to netbox/dcim/migrations/0198_natural_ordering.py index ccc7d1457..83e94a195 100644 --- a/netbox/dcim/migrations/0197_natural_sort.py +++ b/netbox/dcim/migrations/0198_natural_ordering.py @@ -1,21 +1,13 @@ -# Generated by Django 5.0.9 on 2024-11-12 22:21 - -from django.contrib.postgres.operations import CreateCollation from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0196_qinq_svlan'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ - CreateCollation( - "natural_sort", - provider="icu", - locale="und-u-kn-true", - ), migrations.AlterModelOptions( name='site', options={'ordering': ('name',)}, diff --git a/netbox/ipam/migrations/0076_alter_asnrange_name_alter_routetarget_name_and_more.py b/netbox/ipam/migrations/0076_natural_ordering.py similarity index 91% rename from netbox/ipam/migrations/0076_alter_asnrange_name_alter_routetarget_name_and_more.py rename to netbox/ipam/migrations/0076_natural_ordering.py index 40631331b..8c7bfaea1 100644 --- a/netbox/ipam/migrations/0076_alter_asnrange_name_alter_routetarget_name_and_more.py +++ b/netbox/ipam/migrations/0076_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 17:15 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0075_vlan_qinq'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ diff --git a/netbox/project-static/src/buttons/launchModal.ts b/netbox/project-static/src/buttons/launchModal.ts new file mode 100644 index 000000000..dd4e769ad --- /dev/null +++ b/netbox/project-static/src/buttons/launchModal.ts @@ -0,0 +1,18 @@ +import { getElements } from '../util'; +import { Modal } from 'bootstrap'; + +export function initLaunchModal(): void { + console.log('initLaunchModal()'); + const modal_element = document.getElementById('htmx-modal'); + if (modal_element == null) return; + console.log('found modal element'); + const modal = new Modal(modal_element); + console.log('created modal'); + + for (const launchButton of getElements('button.launch-htmx-modal')) { + console.log(`found button: {launchButton}`); + launchButton.addEventListener('click', () => { + modal.show(); + }); + } +} diff --git a/netbox/tenancy/migrations/0017_alter_contact_name_alter_tenant_name_and_more.py b/netbox/tenancy/migrations/0017_natural_ordering.py similarity index 89% rename from netbox/tenancy/migrations/0017_alter_contact_name_alter_tenant_name_and_more.py rename to netbox/tenancy/migrations/0017_natural_ordering.py index 5c0c9cd24..de1fb49aa 100644 --- a/netbox/tenancy/migrations/0017_alter_contact_name_alter_tenant_name_and_more.py +++ b/netbox/tenancy/migrations/0017_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 17:15 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0016_charfield_null_choices'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ diff --git a/netbox/virtualization/migrations/0046_alter_virtualmachine_options_and_more.py b/netbox/virtualization/migrations/0046_natural_ordering.py similarity index 93% rename from netbox/virtualization/migrations/0046_alter_virtualmachine_options_and_more.py rename to netbox/virtualization/migrations/0046_natural_ordering.py index a8080d540..9284b6331 100644 --- a/netbox/virtualization/migrations/0046_alter_virtualmachine_options_and_more.py +++ b/netbox/virtualization/migrations/0046_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 16:54 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('virtualization', '0045_clusters_cached_relations'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ diff --git a/netbox/vpn/migrations/0007_alter_ikepolicy_name_alter_ikeproposal_name_and_more.py b/netbox/vpn/migrations/0007_natural_ordering.py similarity index 94% rename from netbox/vpn/migrations/0007_alter_ikepolicy_name_alter_ikeproposal_name_and_more.py rename to netbox/vpn/migrations/0007_natural_ordering.py index a22eef1e5..01dd4620f 100644 --- a/netbox/vpn/migrations/0007_alter_ikepolicy_name_alter_ikeproposal_name_and_more.py +++ b/netbox/vpn/migrations/0007_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 17:15 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('vpn', '0006_charfield_null_choices'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [ diff --git a/netbox/wireless/migrations/0012_alter_wirelesslangroup_name.py b/netbox/wireless/migrations/0012_natural_ordering.py similarity index 82% rename from netbox/wireless/migrations/0012_alter_wirelesslangroup_name.py rename to netbox/wireless/migrations/0012_natural_ordering.py index c776145e5..da818bdd9 100644 --- a/netbox/wireless/migrations/0012_alter_wirelesslangroup_name.py +++ b/netbox/wireless/migrations/0012_natural_ordering.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-11-13 17:15 - from django.db import migrations, models @@ -7,7 +5,7 @@ class Migration(migrations.Migration): dependencies = [ ('wireless', '0011_wirelesslan__location_wirelesslan__region_and_more'), - ('dcim', '0197_natural_sort'), + ('dcim', '0197_natural_sort_collation'), ] operations = [