diff --git a/netbox/circuits/migrations/0053_owner.py b/netbox/circuits/migrations/0053_owner.py index 04fe46c61..04056bfce 100644 --- a/netbox/circuits/migrations/0053_owner.py +++ b/netbox/circuits/migrations/0053_owner.py @@ -13,56 +13,56 @@ class Migration(migrations.Migration): model_name='circuit', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='circuitgroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='circuittype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='provider', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='provideraccount', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='providernetwork', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualcircuit', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualcircuittype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/core/migrations/0020_owner.py b/netbox/core/migrations/0020_owner.py index ecb30fa3e..f9cdb15b0 100644 --- a/netbox/core/migrations/0020_owner.py +++ b/netbox/core/migrations/0020_owner.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0019_configrevision_active'), ('users', '0015_owner'), @@ -14,11 +13,7 @@ class Migration(migrations.Migration): model_name='datasource', name='owner', field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name='+', - to='users.owner', + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/dcim/migrations/0216_owner.py b/netbox/dcim/migrations/0216_owner.py index a7c5aa899..89b12128a 100644 --- a/netbox/dcim/migrations/0216_owner.py +++ b/netbox/dcim/migrations/0216_owner.py @@ -13,231 +13,231 @@ class Migration(migrations.Migration): model_name='cable', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='consoleport', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='consoleserverport', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='device', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='devicebay', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='devicerole', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='devicetype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='frontport', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='interface', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='inventoryitem', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='inventoryitemrole', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='location', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='macaddress', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='manufacturer', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='module', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='modulebay', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='moduletype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='moduletypeprofile', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='platform', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='powerfeed', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='poweroutlet', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='powerpanel', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='powerport', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='rack', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='rackreservation', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='rackrole', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='racktype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='rearport', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='region', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='site', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='sitegroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualchassis', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualdevicecontext', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/extras/migrations/0134_owner.py b/netbox/extras/migrations/0134_owner.py index 1a01fd95b..2e47cc4e2 100644 --- a/netbox/extras/migrations/0134_owner.py +++ b/netbox/extras/migrations/0134_owner.py @@ -13,77 +13,77 @@ class Migration(migrations.Migration): model_name='configcontext', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='configcontextprofile', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='configtemplate', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='customfield', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='customfieldchoiceset', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='customlink', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='eventrule', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='exporttemplate', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='savedfilter', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='tag', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='webhook', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/ipam/migrations/0083_owner.py b/netbox/ipam/migrations/0083_owner.py index 307963ba0..abc5795fb 100644 --- a/netbox/ipam/migrations/0083_owner.py +++ b/netbox/ipam/migrations/0083_owner.py @@ -13,112 +13,112 @@ class Migration(migrations.Migration): model_name='aggregate', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='asn', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='asnrange', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='fhrpgroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='ipaddress', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='iprange', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='prefix', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='rir', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='role', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='routetarget', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='service', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='servicetemplate', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='vlan', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='vlangroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='vlantranslationpolicy', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='vrf', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/netbox/models/mixins.py b/netbox/netbox/models/mixins.py index 10798796d..ef1cd9e96 100644 --- a/netbox/netbox/models/mixins.py +++ b/netbox/netbox/models/mixins.py @@ -19,7 +19,6 @@ class OwnerMixin(models.Model): owner = models.ForeignKey( to='users.Owner', on_delete=models.PROTECT, - related_name='+', blank=True, null=True ) diff --git a/netbox/templates/users/owner.html b/netbox/templates/users/owner.html index b840c3b67..7aa9b2edd 100644 --- a/netbox/templates/users/owner.html +++ b/netbox/templates/users/owner.html @@ -19,8 +19,6 @@ - -

{% trans "Groups" %}

@@ -42,5 +40,8 @@
+
+ {% include 'inc/panels/related_objects.html' with filter_name='owner_id' %} +
{% endblock %} diff --git a/netbox/tenancy/migrations/0021_owner.py b/netbox/tenancy/migrations/0021_owner.py index b6fedda88..4c1a52abb 100644 --- a/netbox/tenancy/migrations/0021_owner.py +++ b/netbox/tenancy/migrations/0021_owner.py @@ -13,35 +13,35 @@ class Migration(migrations.Migration): model_name='contact', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='contactgroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='contactrole', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='tenant', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='tenantgroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/users/views.py b/netbox/users/views.py index aa0efdd72..7c833568f 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -4,7 +4,7 @@ from core.models import ObjectChange from core.tables import ObjectChangeTable from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport, BulkRename from netbox.views import generic -from utilities.views import register_model_view +from utilities.views import GetRelatedModelsMixin, register_model_view from . import filtersets, forms, tables from .models import Group, User, ObjectPermission, Owner, Token @@ -246,10 +246,19 @@ class OwnerListView(generic.ObjectListView): @register_model_view(Owner) -class OwnerView(generic.ObjectView): +class OwnerView(GetRelatedModelsMixin, generic.ObjectView): queryset = Owner.objects.all() template_name = 'users/owner.html' + def get_extra_context(self, request, instance): + return { + 'related_models': self.get_related_models( + request, + instance, + omit=(Group, User), + ), + } + @register_model_view(Owner, 'add', detail=False) @register_model_view(Owner, 'edit') diff --git a/netbox/virtualization/migrations/0049_owner.py b/netbox/virtualization/migrations/0049_owner.py index 657d325ec..630b7fc80 100644 --- a/netbox/virtualization/migrations/0049_owner.py +++ b/netbox/virtualization/migrations/0049_owner.py @@ -13,42 +13,42 @@ class Migration(migrations.Migration): model_name='cluster', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='clustergroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='clustertype', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualdisk', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='virtualmachine', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='vminterface', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/vpn/migrations/0010_owner.py b/netbox/vpn/migrations/0010_owner.py index 135084f84..19749f213 100644 --- a/netbox/vpn/migrations/0010_owner.py +++ b/netbox/vpn/migrations/0010_owner.py @@ -13,56 +13,56 @@ class Migration(migrations.Migration): model_name='ikepolicy', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='ikeproposal', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='ipsecpolicy', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='ipsecprofile', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='ipsecproposal', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='l2vpn', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='tunnel', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='tunnelgroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ] diff --git a/netbox/wireless/migrations/0016_owner.py b/netbox/wireless/migrations/0016_owner.py index 08167290c..fa753ffc3 100644 --- a/netbox/wireless/migrations/0016_owner.py +++ b/netbox/wireless/migrations/0016_owner.py @@ -13,21 +13,21 @@ class Migration(migrations.Migration): model_name='wirelesslan', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='wirelesslangroup', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), migrations.AddField( model_name='wirelesslink', name='owner', field=models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='users.owner' + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.owner' ), ), ]