NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 16:26:09 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Move base_template and table_config context vars to base context

Browse Source
This commit is contained in:
Jeremy Stretch 2023-08-07 11:38:09 -04:00
parent 2af2ccc6c1
commit 9652210d56
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/ipam/views.py
View File

@ -367,9 +367,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView):
return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned) return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned)
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
return { return {
**context,
'bulk_querystring': f'within={instance.prefix}', 'bulk_querystring': f'within={instance.prefix}',
'first_available_prefix': instance.get_first_available_prefix(), 'first_available_prefix': instance.get_first_available_prefix(),
'show_available': bool(request.GET.get('show_available', 'true') == 'true'), 'show_available': bool(request.GET.get('show_available', 'true') == 'true'),
@ -556,9 +554,7 @@ class PrefixPrefixesView(generic.ObjectChildrenView):
return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned) return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned)
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
return { return {
**context,
'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&within={instance.prefix}", 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&within={instance.prefix}",
'first_available_prefix': instance.get_first_available_prefix(), 'first_available_prefix': instance.get_first_available_prefix(),
'show_available': bool(request.GET.get('show_available', 'true') == 'true'), 'show_available': bool(request.GET.get('show_available', 'true') == 'true'),
@ -586,9 +582,7 @@ class PrefixIPRangesView(generic.ObjectChildrenView):
) )
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
return { return {
**context,
'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}", 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}",
'first_available_ip': instance.get_first_available_ip(), 'first_available_ip': instance.get_first_available_ip(),
} }
@ -617,9 +611,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView):
return queryset return queryset
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
return { return {
**context,
'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}", 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}",
'first_available_ip': instance.get_first_available_ip(), 'first_available_ip': instance.get_first_available_ip(),
} }

11
netbox/netbox/views/generic/object_views.py
View File

@ -113,15 +113,6 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
""" """
return queryset return queryset
def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
context.update({
'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html',
'table_config': f'{self.table.__name__}_config',
})
return context
# #
# Request handlers # Request handlers
# #
@ -153,7 +144,9 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
return render(request, self.get_template_name(), { return render(request, self.get_template_name(), {
'object': instance, 'object': instance,
'child_model': self.child_model, 'child_model': self.child_model,
'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html',
'table': table, 'table': table,
'table_config': f'{self.table.__name__}_config',
'actions': actions, 'actions': actions,
'tab': self.tab, 'tab': self.tab,
'return_url': request.get_full_path(), 'return_url': request.get_full_path(),