Skip to content

Commit 8b63eb6

Browse files
authored
Merge pull request #19860 from netbox-community/19839-nested-object-parent-export
Fixes #19839: Enable export of parent assignment for recursively nested objects
2 parents cff29f9 + 23cc4f1 commit 8b63eb6

File tree

5 files changed

+38
-10
lines changed

5 files changed

+38
-10
lines changed

netbox/dcim/tables/devices.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ class DeviceRoleTable(NetBoxTable):
6363
verbose_name=_('Name'),
6464
linkify=True
6565
)
66+
parent = tables.Column(
67+
verbose_name=_('Parent'),
68+
linkify=True,
69+
)
6670
device_count = columns.LinkedCountColumn(
6771
viewname='dcim:device_list',
6872
url_params={'role_id': 'pk'},
@@ -88,8 +92,8 @@ class DeviceRoleTable(NetBoxTable):
8892
class Meta(NetBoxTable.Meta):
8993
model = models.DeviceRole
9094
fields = (
91-
'pk', 'id', 'name', 'device_count', 'vm_count', 'color', 'vm_role', 'config_template', 'description',
92-
'slug', 'tags', 'actions', 'created', 'last_updated',
95+
'pk', 'id', 'name', 'parent', 'device_count', 'vm_count', 'color', 'vm_role', 'config_template',
96+
'description', 'slug', 'tags', 'actions', 'created', 'last_updated',
9397
)
9498
default_columns = ('pk', 'name', 'device_count', 'vm_count', 'color', 'vm_role', 'description')
9599

netbox/dcim/tables/sites.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ class RegionTable(ContactsColumnMixin, NetBoxTable):
2424
verbose_name=_('Name'),
2525
linkify=True
2626
)
27+
parent = tables.Column(
28+
verbose_name=_('Parent'),
29+
linkify=True,
30+
)
2731
site_count = columns.LinkedCountColumn(
2832
viewname='dcim:site_list',
2933
url_params={'region_id': 'pk'},
@@ -39,7 +43,7 @@ class RegionTable(ContactsColumnMixin, NetBoxTable):
3943
class Meta(NetBoxTable.Meta):
4044
model = Region
4145
fields = (
42-
'pk', 'id', 'name', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
46+
'pk', 'id', 'name', 'parent', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
4347
'created', 'last_updated', 'actions',
4448
)
4549
default_columns = ('pk', 'name', 'site_count', 'description')
@@ -54,6 +58,10 @@ class SiteGroupTable(ContactsColumnMixin, NetBoxTable):
5458
verbose_name=_('Name'),
5559
linkify=True
5660
)
61+
parent = tables.Column(
62+
verbose_name=_('Parent'),
63+
linkify=True,
64+
)
5765
site_count = columns.LinkedCountColumn(
5866
viewname='dcim:site_list',
5967
url_params={'group_id': 'pk'},
@@ -69,7 +77,7 @@ class SiteGroupTable(ContactsColumnMixin, NetBoxTable):
6977
class Meta(NetBoxTable.Meta):
7078
model = SiteGroup
7179
fields = (
72-
'pk', 'id', 'name', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
80+
'pk', 'id', 'name', 'parent', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
7381
'created', 'last_updated', 'actions',
7482
)
7583
default_columns = ('pk', 'name', 'site_count', 'description')
@@ -135,6 +143,10 @@ class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
135143
verbose_name=_('Name'),
136144
linkify=True
137145
)
146+
parent = tables.Column(
147+
verbose_name=_('Parent'),
148+
linkify=True,
149+
)
138150
site = tables.Column(
139151
verbose_name=_('Site'),
140152
linkify=True
@@ -170,8 +182,8 @@ class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
170182
class Meta(NetBoxTable.Meta):
171183
model = Location
172184
fields = (
173-
'pk', 'id', 'name', 'site', 'status', 'facility', 'tenant', 'tenant_group', 'rack_count', 'device_count',
174-
'description', 'slug', 'comments', 'contacts', 'tags', 'actions', 'created', 'last_updated',
185+
'pk', 'id', 'name', 'parent', 'site', 'status', 'facility', 'tenant', 'tenant_group', 'rack_count',
186+
'device_count', 'description', 'slug', 'comments', 'contacts', 'tags', 'actions', 'created', 'last_updated',
175187
'vlangroup_count',
176188
)
177189
default_columns = (

netbox/tenancy/tables/contacts.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ class ContactGroupTable(NetBoxTable):
1919
verbose_name=_('Name'),
2020
linkify=True
2121
)
22+
parent = tables.Column(
23+
verbose_name=_('Parent'),
24+
linkify=True,
25+
)
2226
contact_count = columns.LinkedCountColumn(
2327
viewname='tenancy:contact_list',
2428
url_params={'group_id': 'pk'},
@@ -34,7 +38,7 @@ class ContactGroupTable(NetBoxTable):
3438
class Meta(NetBoxTable.Meta):
3539
model = ContactGroup
3640
fields = (
37-
'pk', 'name', 'contact_count', 'description', 'comments', 'slug', 'tags', 'created',
41+
'pk', 'name', 'parent', 'contact_count', 'description', 'comments', 'slug', 'tags', 'created',
3842
'last_updated', 'actions',
3943
)
4044
default_columns = ('pk', 'name', 'contact_count', 'description')

netbox/tenancy/tables/tenants.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ class TenantGroupTable(NetBoxTable):
1616
verbose_name=_('Name'),
1717
linkify=True
1818
)
19+
parent = tables.Column(
20+
verbose_name=_('Parent'),
21+
linkify=True,
22+
)
1923
tenant_count = columns.LinkedCountColumn(
2024
viewname='tenancy:tenant_list',
2125
url_params={'group_id': 'pk'},
@@ -31,7 +35,7 @@ class TenantGroupTable(NetBoxTable):
3135
class Meta(NetBoxTable.Meta):
3236
model = TenantGroup
3337
fields = (
34-
'pk', 'id', 'name', 'tenant_count', 'description', 'comments', 'slug', 'tags', 'created',
38+
'pk', 'id', 'name', 'parent', 'tenant_count', 'description', 'comments', 'slug', 'tags', 'created',
3539
'last_updated', 'actions',
3640
)
3741
default_columns = ('pk', 'name', 'tenant_count', 'description')

netbox/wireless/tables/wirelesslan.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ class WirelessLANGroupTable(NetBoxTable):
1818
verbose_name=_('Name'),
1919
linkify=True
2020
)
21+
parent = tables.Column(
22+
verbose_name=_('Parent'),
23+
linkify=True,
24+
)
2125
wirelesslan_count = columns.LinkedCountColumn(
2226
viewname='wireless:wirelesslan_list',
2327
url_params={'group_id': 'pk'},
@@ -33,8 +37,8 @@ class WirelessLANGroupTable(NetBoxTable):
3337
class Meta(NetBoxTable.Meta):
3438
model = WirelessLANGroup
3539
fields = (
36-
'pk', 'name', 'wirelesslan_count', 'slug', 'description', 'comments', 'tags', 'created', 'last_updated',
37-
'actions',
40+
'pk', 'name', 'parent', 'slug', 'description', 'comments', 'tags', 'wirelesslan_count', 'created',
41+
'last_updated', 'actions',
3842
)
3943
default_columns = ('pk', 'name', 'wirelesslan_count', 'description')
4044

0 commit comments

Comments
 (0)