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

#6454 suggested review changes

Browse Source
This commit is contained in:
Arthur
2022-08-22 12:59:26 -07:00
parent a972174706
commit 25ec624e4e
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/netbox/views/generic/bulk_views.py
View File

@ -124,7 +124,6 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
""" """
model = self.queryset.model model = self.queryset.model
content_type = ContentType.objects.get_for_model(model) content_type = ContentType.objects.get_for_model(model)
requirement = get_prerequisite_model(self.queryset)
if self.filterset: if self.filterset:
self.queryset = self.filterset(request.GET, self.queryset).qs self.queryset = self.filterset(request.GET, self.queryset).qs
@ -172,7 +171,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
'table': table, 'table': table,
'actions': actions, 'actions': actions,
'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None, 'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None,
'prerequisite_model': requirement if requirement else None, 'prerequisite_model': get_prerequisite_model(self.queryset),
**self.get_extra_context(request), **self.get_extra_context(request),
} }

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

@ -347,13 +347,12 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
form = self.form(instance=obj, initial=initial_data) form = self.form(instance=obj, initial=initial_data)
restrict_form_fields(form, request.user) restrict_form_fields(form, request.user)
requirement = get_prerequisite_model(self.queryset)
return render(request, self.template_name, { return render(request, self.template_name, {
'model': model, 'model': model,
'object': obj, 'object': obj,
'form': form, 'form': form,
'return_url': self.get_return_url(request, obj), 'return_url': self.get_return_url(request, obj),
'prerequisite_model': requirement if requirement else None, 'prerequisite_model': get_prerequisite_model(self.queryset),
**self.get_extra_context(request, obj), **self.get_extra_context(request, obj),
}) })

1
netbox/templates/generic/object_list.html
View File

@ -105,7 +105,6 @@ Context:
{% include 'inc/missing_prerequisites.html' %} {% include 'inc/missing_prerequisites.html' %}
{% endif %} {% endif %}
<div class="card"> <div class="card">
<div class="card-body" id="object_list"> <div class="card-body" id="object_list">
{% include 'htmx/table.html' %} {% include 'htmx/table.html' %}