Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

12489 Use HTMX for Location and Non-Racked Devices in Site detail view #12491

Merged
merged 17 commits into from
Aug 28, 2023
Merged

12489 Use HTMX for Location and Non-Racked Devices in Site detail view #12491

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
68874f2
12489 use htmx for site view locations and non-racked-devices
arthanson May 4, 2023
054e3c1
12489 remove now unused queries in context
arthanson May 4, 2023
20ad552
adds device type and role to device component filter #12015
abhi1693 May 5, 2023
0a6c630
Revert "Fixes #12463: Fix the association of completed jobs with repo…
abhi1693 May 5, 2023
73e20ef
12489 update nonracked_devices on rack and location templates
arthanson May 5, 2023
e1b342e
12489 fix whitespace issue
arthanson May 5, 2023
cb3fa5f
Undo errant commits
jeremystretch May 9, 2023
77737b5
12489 update site id in templates
arthanson May 9, 2023
183a7ae
Merge branch 'develop' into 12489-site-locations
arthanson May 11, 2023
816cee5
12489 remove nonracked_devices include
arthanson May 11, 2023
19b7a20
12489 add has_position filter
arthanson May 15, 2023
9166452
12489 merge develop
arthanson Aug 16, 2023
22aa6c9
Merge branch 'develop' into 12489-site-locations
jeremystretch Aug 28, 2023
207ff89
Use empty lookup for position field
jeremystretch Aug 28, 2023
211eed4
Remove non-racked devices list from rack view (was moved to a tab)
jeremystretch Aug 28, 2023
1402d26
Clean up location and device tables
jeremystretch Aug 28, 2023
4f5dba5
Restore plugins block on rack template
jeremystretch Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions netbox/dcim/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,10 @@ class DeviceFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilter
queryset=Rack.objects.all(),
label=_('Rack (ID)'),
)
has_position = django_filters.BooleanFilter(
jeremystretch marked this conversation as resolved.
Show resolved Hide resolved
label=_('Has a position'),
method='_has_position'
)
cluster_id = django_filters.ModelMultipleChoiceFilter(
queryset=Cluster.objects.all(),
label=_('VM cluster (ID)'),
Expand Down Expand Up @@ -1050,6 +1054,9 @@ def _module_bays(self, queryset, name, value):
def _device_bays(self, queryset, name, value):
return queryset.exclude(devicebays__isnull=value)

def _has_position(self, queryset, name, value):
return queryset.exclude(position__isnull=value)


class VirtualDeviceContextFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
device_id = django_filters.ModelMultipleChoiceFilter(
Expand Down
32 changes: 0 additions & 32 deletions netbox/dcim/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,32 +398,8 @@ def get_extra_context(self, request, instance):
(Circuit.objects.restrict(request.user, 'view').filter(terminations__site=instance).distinct(), 'site_id'),
)

locations = Location.objects.add_related_count(
Location.objects.all(),
Rack,
'location',
'rack_count',
cumulative=True
)
locations = Location.objects.add_related_count(
locations,
Device,
'location',
'device_count',
cumulative=True
).restrict(request.user, 'view').filter(site=instance)

nonracked_devices = Device.objects.filter(
site=instance,
rack__isnull=True,
parent_bay__isnull=True
).prefetch_related('device_type__manufacturer', 'parent_bay', 'device_role')

return {
'related_models': related_models,
'locations': locations,
'nonracked_devices': nonracked_devices.order_by('-pk')[:10],
'total_nonracked_devices_count': nonracked_devices.count(),
}


Expand Down Expand Up @@ -495,16 +471,8 @@ def get_extra_context(self, request, instance):
(Device.objects.restrict(request.user, 'view').filter(location__in=locations), 'location_id'),
)

nonracked_devices = Device.objects.filter(
location=instance,
rack__isnull=True,
parent_bay__isnull=True
).prefetch_related('device_type__manufacturer', 'parent_bay', 'device_role')

return {
'related_models': related_models,
'nonracked_devices': nonracked_devices.order_by('-pk')[:10],
'total_nonracked_devices_count': nonracked_devices.count(),
}


Expand Down
76 changes: 0 additions & 76 deletions netbox/templates/dcim/inc/nonracked_devices.html
View file
Open in desktop
arthanson marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

19 changes: 18 additions & 1 deletion netbox/templates/dcim/location.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,30 @@ <h5 class="card-header">
</div>
<div class="col col-md-6">
{% include 'inc/panels/related_objects.html' %}
{% include 'dcim/inc/nonracked_devices.html' %}
{% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
</div>
</div>
<div class="row mb-3">
<div class="col col-md-12">
<div class="card">
<h5 class="card-header">
Non-Racked Devices
</h5>
<div class="card-body htmx-container table-responsive"
hx-get="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
hx-trigger="load"
></div>

{% if perms.dcim.add_device %}
<div class="card-footer text-end noprint">
<a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}" class="btn btn-primary btn-sm">
<i class="mdi mdi-plus-thick" aria-hidden="true"></i>
Add a Non-Racked Device
</a>
</div>
{% endif %}
</div>
<div class="card">
<h5 class="card-header">Child Locations</h5>
<div class="card-body htmx-container table-responsive"
Expand Down
20 changes: 19 additions & 1 deletion netbox/templates/dcim/rack.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,25 @@ <h4>Rear</h4>
</div>
<div class="row">
<div class="col col-md-12">
{% plugin_full_width_page object %}
<div class="card">
<h5 class="card-header">
Non-Racked Devices
</h5>
<div class="card-body htmx-container table-responsive"
hx-get="{% url 'dcim:device_list' %}?rack_id={{ object.pk }}&has_position=False&parent_bay_id=null"
hx-trigger="load"
></div>

{% if perms.dcim.add_device %}
<div class="card-footer text-end noprint">
<a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&rack={{ object.pk }}" class="btn btn-primary btn-sm">
<i class="mdi mdi-plus-thick" aria-hidden="true"></i>
Add a Non-Racked Device
</a>
</div>
{% endif %}
</div>
{% plugin_full_width_page object %}
</div>
</div>
{% endblock %}
33 changes: 32 additions & 1 deletion netbox/templates/dcim/site.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,38 @@ <h5 class="card-header">Locations</h5>
</div>
<div class="row">
<div class="col col-md-12">
{% include 'dcim/inc/nonracked_devices.html' %}
<div class="card">
<h5 class="card-header">Locations</h5>
<div class="card-body htmx-container table-responsive"
hx-get="{% url 'dcim:location_list' %}?site_id={{ object.pk }}"
hx-trigger="load"
></div>
{% if perms.dcim.add_location %}
<div class="card-footer text-end noprint">
<a href="{% url 'dcim:location_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
<i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a location
</a>
</div>
{% endif %}
</div>
<div class="card">
<h5 class="card-header">
Non-Racked Devices
</h5>
<div class="card-body htmx-container table-responsive"
hx-get="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
hx-trigger="load"
></div>

{% if perms.dcim.add_device %}
<div class="card-footer text-end noprint">
<a href="{% url 'dcim:device_add' %}?site={{ object.pk }}" class="btn btn-primary btn-sm">
<i class="mdi mdi-plus-thick" aria-hidden="true"></i>
Add a Non-Racked Device
</a>
</div>
{% endif %}
</div>
{% plugin_full_width_page object %}
</div>
</div>
Expand Down
Loading