jeremystretch 4 лет назад
Родитель
Сommit
64dad7dbd2

+ 0 - 2
netbox/circuits/migrations/0003_rename_cable_peer.py

@@ -1,5 +1,3 @@
-# Generated by Django 3.2.8 on 2021-10-13 17:47
-
 from django.db import migrations
 
 

+ 1 - 3
netbox/dcim/migrations/0139_rename_cable_peer.py → netbox/dcim/migrations/0136_rename_cable_peer.py

@@ -1,12 +1,10 @@
-# Generated by Django 3.2.8 on 2021-10-13 17:47
-
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0138_interface_wireless_link'),
+        ('dcim', '0135_location_tenant'),
     ]
 
     operations = [

+ 0 - 26
netbox/dcim/migrations/0136_wireless.py

@@ -1,26 +0,0 @@
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0135_location_tenant'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='interface',
-            name='rf_role',
-            field=models.CharField(blank=True, max_length=30),
-        ),
-        migrations.AddField(
-            model_name='interface',
-            name='rf_channel',
-            field=models.CharField(blank=True, max_length=50),
-        ),
-        migrations.AddField(
-            model_name='interface',
-            name='rf_channel_width',
-            field=models.PositiveSmallIntegerField(blank=True, null=True),
-        ),
-    ]

+ 22 - 3
netbox/dcim/migrations/0137_wireless.py

@@ -1,19 +1,38 @@
-# Generated by Django 3.2.8 on 2021-10-13 13:44
-
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0136_wireless'),
+        ('dcim', '0136_rename_cable_peer'),
         ('wireless', '0001_wireless'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='interface',
+            name='rf_role',
+            field=models.CharField(blank=True, max_length=30),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='rf_channel',
+            field=models.CharField(blank=True, max_length=50),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='rf_channel_width',
+            field=models.PositiveSmallIntegerField(blank=True, null=True),
+        ),
         migrations.AddField(
             model_name='interface',
             name='wireless_lans',
             field=models.ManyToManyField(blank=True, related_name='interfaces', to='wireless.WirelessLAN'),
         ),
+        migrations.AddField(
+            model_name='interface',
+            name='wireless_link',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wireless.wirelesslink'),
+        ),
     ]

+ 0 - 20
netbox/dcim/migrations/0138_interface_wireless_link.py

@@ -1,20 +0,0 @@
-# Generated by Django 3.2.8 on 2021-10-13 15:29
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wireless', '0001_wireless'),
-        ('dcim', '0137_wireless'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='interface',
-            name='wireless_link',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wireless.wirelesslink'),
-        ),
-    ]

+ 1 - 1
netbox/wireless/migrations/0001_wireless.py

@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('dcim', '0136_wireless'),
+        ('dcim', '0136_rename_cable_peer'),
         ('extras', '0062_clear_secrets_changelog'),
         ('ipam', '0050_iprange'),
     ]