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

#3892: Convert EXPORTTEMPLATE_MODELS to a Q object

Browse Source
This commit is contained in:
Jeremy Stretch
2020-01-15 16:11:44 -05:00
parent f81e7d30e2
commit d9437a08f0
5 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
netbox/extras/constants.py
View File

@ -82,35 +82,47 @@ GRAPH_MODELS = Q(
) )
# Models which support export templates # Models which support export templates
EXPORTTEMPLATE_MODELS = [ EXPORTTEMPLATE_MODELS = Q(
'circuits.circuit', Q(app_label='circuits', model__in=[
'circuits.provider', 'circuit',
'dcim.cable', 'provider',
'dcim.consoleport', ]) |
'dcim.device', Q(app_label='dcim', model__in=[
'dcim.devicetype', 'cable',
'dcim.interface', 'consoleport',
'dcim.inventoryitem', 'device',
'dcim.manufacturer', 'devicetype',
'dcim.powerpanel', 'interface',
'dcim.powerport', 'inventoryitem',
'dcim.powerfeed', 'manufacturer',
'dcim.rack', 'powerpanel',
'dcim.rackgroup', 'powerport',
'dcim.region', 'powerfeed',
'dcim.site', 'rack',
'dcim.virtualchassis', 'rackgroup',
'ipam.aggregate', 'region',
'ipam.ipaddress', 'site',
'ipam.prefix', 'virtualchassis',
'ipam.service', ]) |
'ipam.vlan', Q(app_label='ipam', model__in=[
'ipam.vrf', 'aggregate',
'secrets.secret', 'ipaddress',
'tenancy.tenant', 'prefix',
'virtualization.cluster', 'service',
'virtualization.virtualmachine', 'vlan',
] 'vrf',
]) |
Q(app_label='secrets', model__in=[
'secret',
]) |
Q(app_label='tenancy', model__in=[
'tenant',
]) |
Q(app_label='virtualization', model__in=[
'cluster',
'virtualmachine',
])
)
# Report logging levels # Report logging levels
LOG_DEFAULT = 0 LOG_DEFAULT = 0

2
netbox/extras/migrations/0022_custom_links.py
View File

@ -38,7 +38,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='exporttemplate', model_name='exporttemplate',
name='content_type', name='content_type',
field=models.ForeignKey(limit_choices_to=extras.models.get_export_template_models, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='webhook', model_name='webhook',

2
netbox/extras/migrations/0022_custom_links_squashed_0034_configcontext_tags.py
View File

@ -120,7 +120,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='exporttemplate', model_name='exporttemplate',
name='content_type', name='content_type',
field=models.ForeignKey(limit_choices_to=extras.models.get_export_template_models, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='webhook', model_name='webhook',

7
netbox/extras/migrations/0036_contenttype_filters_to_q_objects.py
View File

@ -1,4 +1,4 @@
# Generated by Django 2.2.8 on 2020-01-15 21:07 # Generated by Django 2.2.8 on 2020-01-15 21:11
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
@ -21,6 +21,11 @@ class Migration(migrations.Migration):
name='content_type', name='content_type',
field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ['circuit', 'provider'])), models.Q(('app_label', 'dcim'), ('model__in', ['cable', 'device', 'devicetype', 'powerpanel', 'powerfeed', 'rack', 'site'])), models.Q(('app_label', 'ipam'), ('model__in', ['aggregate', 'ipaddress', 'prefix', 'service', 'vlan', 'vrf'])), models.Q(('app_label', 'secrets'), ('model__in', ['secret'])), models.Q(('app_label', 'tenancy'), ('model__in', ['tenant'])), models.Q(('app_label', 'virtualization'), ('model__in', ['cluster', 'virtualmachine'])), _connector='OR')), on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ['circuit', 'provider'])), models.Q(('app_label', 'dcim'), ('model__in', ['cable', 'device', 'devicetype', 'powerpanel', 'powerfeed', 'rack', 'site'])), models.Q(('app_label', 'ipam'), ('model__in', ['aggregate', 'ipaddress', 'prefix', 'service', 'vlan', 'vrf'])), models.Q(('app_label', 'secrets'), ('model__in', ['secret'])), models.Q(('app_label', 'tenancy'), ('model__in', ['tenant'])), models.Q(('app_label', 'virtualization'), ('model__in', ['cluster', 'virtualmachine'])), _connector='OR')), on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
), ),
migrations.AlterField(
model_name='exporttemplate',
name='content_type',
field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ['circuit', 'provider'])), models.Q(('app_label', 'dcim'), ('model__in', ['cable', 'consoleport', 'device', 'devicetype', 'interface', 'inventoryitem', 'manufacturer', 'powerpanel', 'powerport', 'powerfeed', 'rack', 'rackgroup', 'region', 'site', 'virtualchassis'])), models.Q(('app_label', 'ipam'), ('model__in', ['aggregate', 'ipaddress', 'prefix', 'service', 'vlan', 'vrf'])), models.Q(('app_label', 'secrets'), ('model__in', ['secret'])), models.Q(('app_label', 'tenancy'), ('model__in', ['tenant'])), models.Q(('app_label', 'virtualization'), ('model__in', ['cluster', 'virtualmachine'])), _connector='OR')), on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
),
migrations.AlterField( migrations.AlterField(
model_name='graph', model_name='graph',
name='type', name='type',

6
netbox/extras/models.py
View File

@ -482,15 +482,11 @@ class Graph(models.Model):
# Export templates # Export templates
# #
def get_export_template_models():
return model_names_to_filter_dict(EXPORTTEMPLATE_MODELS)
class ExportTemplate(models.Model): class ExportTemplate(models.Model):
content_type = models.ForeignKey( content_type = models.ForeignKey(
to=ContentType, to=ContentType,
on_delete=models.CASCADE, on_delete=models.CASCADE,
limit_choices_to=get_export_template_models limit_choices_to=EXPORTTEMPLATE_MODELS
) )
name = models.CharField( name = models.CharField(
max_length=100 max_length=100