NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 08:46:10 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Accommodate recent changes in feature branch

Browse Source
This commit is contained in:
jeremystretch 2022-11-04 08:55:32 -04:00
parent 2832dc7c9a
commit 341243c2ec
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/dcim/migrations/0165_virtualdevicecontexts.py → netbox/dcim/migrations/0166_virtualdevicecontexts.py
View File

@ -1,4 +1,4 @@
# Generated by Django 4.1.2 on 2022-11-02 13:24 # Generated by Django 4.1.2 on 2022-11-04 12:46
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
@ -9,10 +9,10 @@ import utilities.json
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('ipam', '0062_unique_constraints'), ('extras', '0083_savedfilter'),
('extras', '0082_exporttemplate_content_types'), ('ipam', '0063_standardize_description_comments'),
('tenancy', '0008_unique_constraints'), ('tenancy', '0009_standardize_description_comments'),
('dcim', '0164_rack_mounting_depth'), ('dcim', '0165_standardize_description_comments'),
] ]
operations = [ operations = [
@ -23,6 +23,7 @@ class Migration(migrations.Migration):
('created', models.DateTimeField(auto_now_add=True, null=True)), ('created', models.DateTimeField(auto_now_add=True, null=True)),
('last_updated', models.DateTimeField(auto_now=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)),
('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)), ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)),
('description', models.CharField(blank=True, max_length=200)),
('name', models.CharField(max_length=64)), ('name', models.CharField(max_length=64)),
('status', models.CharField(blank=True, max_length=50)), ('status', models.CharField(blank=True, max_length=50)),
('identifier', models.PositiveSmallIntegerField(blank=True, null=True)), ('identifier', models.PositiveSmallIntegerField(blank=True, null=True)),

2
netbox/dcim/models/devices.py
View File

@ -1065,7 +1065,7 @@ class VirtualChassis(PrimaryModel):
return super().delete(*args, **kwargs) return super().delete(*args, **kwargs)
class VirtualDeviceContext(NetBoxModel): class VirtualDeviceContext(PrimaryModel):
device = models.ForeignKey( device = models.ForeignKey(
to='Device', to='Device',
on_delete=models.PROTECT, on_delete=models.PROTECT,