فهرست منبع

Fix schema deconstruction for NaturalOrderingField

Jeremy Stretch 5 سال پیش
والد
کامیت
b5d53fa850

+ 8 - 8
netbox/dcim/migrations/0093_device_component_ordering.py

@@ -79,42 +79,42 @@ class Migration(migrations.Migration):
         migrations.AddField(
         migrations.AddField(
             model_name='consoleport',
             model_name='consoleport',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='consoleserverport',
             model_name='consoleserverport',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='devicebay',
             model_name='devicebay',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='frontport',
             model_name='frontport',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='inventoryitem',
             model_name='inventoryitem',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='poweroutlet',
             model_name='poweroutlet',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='powerport',
             model_name='powerport',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='rearport',
             model_name='rearport',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.RunPython(
         migrations.RunPython(
             code=naturalize_consoleports,
             code=naturalize_consoleports,

+ 7 - 7
netbox/dcim/migrations/0094_device_component_template_ordering.py

@@ -75,37 +75,37 @@ class Migration(migrations.Migration):
         migrations.AddField(
         migrations.AddField(
             model_name='consoleporttemplate',
             model_name='consoleporttemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='consoleserverporttemplate',
             model_name='consoleserverporttemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='devicebaytemplate',
             model_name='devicebaytemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='frontporttemplate',
             model_name='frontporttemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='poweroutlettemplate',
             model_name='poweroutlettemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='powerporttemplate',
             model_name='powerporttemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='rearporttemplate',
             model_name='rearporttemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.RunPython(
         migrations.RunPython(
             code=naturalize_consoleporttemplates,
             code=naturalize_consoleporttemplates,

+ 3 - 3
netbox/dcim/migrations/0095_primary_model_ordering.py

@@ -43,17 +43,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
         migrations.AddField(
             model_name='device',
             model_name='device',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='rack',
             model_name='rack',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='site',
             model_name='site',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         ),
         migrations.RunPython(
         migrations.RunPython(
             code=naturalize_sites,
             code=naturalize_sites,

+ 2 - 2
netbox/dcim/migrations/0096_interface_ordering.py

@@ -35,12 +35,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
         migrations.AddField(
             model_name='interface',
             model_name='interface',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         ),
         migrations.AddField(
         migrations.AddField(
             model_name='interfacetemplate',
             model_name='interfacetemplate',
             name='_name',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         ),
         migrations.RunPython(
         migrations.RunPython(
             code=naturalize_interfacetemplates,
             code=naturalize_interfacetemplates,

+ 1 - 1
netbox/utilities/fields.py

@@ -68,6 +68,6 @@ class NaturalOrderingField(models.CharField):
         return (
         return (
             self.name,
             self.name,
             'utilities.fields.NaturalOrderingField',
             'utilities.fields.NaturalOrderingField',
-            ['target_field'],
+            [self.target_field],
             kwargs,
             kwargs,
         )
         )