mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Use DjangoJSONEncoder for encoding custom field data

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-25 13:57:18 -04:00
parent fb8904af54
commit 5b3de8defe
7 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/circuits/migrations/0020_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,11 +12,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='circuit',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='provider',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]

13
netbox/dcim/migrations/0115_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,26 +12,26 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='device',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='devicetype',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='powerfeed',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='rack',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='site',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]

3
netbox/extras/models/customfields.py
View File

@ -1,9 +1,9 @@
from collections import OrderedDict
from datetime import date
from django import forms
from django.contrib.contenttypes.models import ContentType
from django.contrib.postgres.fields import ArrayField
from django.core.serializers.json import DjangoJSONEncoder
from django.core.validators import ValidationError
from django.db import models
@ -17,6 +17,7 @@ class CustomFieldModel(models.Model):
Abstract class for any model which may have custom fields associated with it.
"""
custom_field_data = models.JSONField(
encoder=DjangoJSONEncoder,
blank=True,
default=dict
)

15
netbox/ipam/migrations/0038_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,31 +12,31 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='aggregate',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='ipaddress',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='prefix',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='service',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='vlan',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='vrf',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]

5
netbox/secrets/migrations/0010_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,6 +12,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='secret',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]

5
netbox/tenancy/migrations/0010_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,6 +12,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tenant',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]

7
netbox/virtualization/migrations/0018_custom_field_data.py
View File

@ -1,5 +1,4 @@
# Generated by Django 3.1 on 2020-08-21 18:34
import django.core.serializers.json
from django.db import migrations, models
@ -13,11 +12,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='cluster',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
migrations.AddField(
model_name='virtualmachine',
name='custom_field_data',
field=models.JSONField(blank=True, default=dict),
field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
]