mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-26 09:16:10 -06:00
Merge branch 'develop' into 12363-journal-paragraph-render
This commit is contained in:
commit
afd43e63b3
@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
## v3.5.1 (FUTURE)
|
## v3.5.1 (FUTURE)
|
||||||
|
|
||||||
|
## Enhancements
|
||||||
|
|
||||||
|
* [#10759](https://github.com/netbox-community/netbox/issues/10759) - Support Markdown rendering for custom field descriptions
|
||||||
|
* [#11422](https://github.com/netbox-community/netbox/issues/11422) - Match on power panel name when searching for power feeds
|
||||||
|
* [#11504](https://github.com/netbox-community/netbox/issues/11504) - Add filter to select individual racks under rack elevations view
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* [#12367](https://github.com/netbox-community/netbox/issues/12367) - Fix `RelatedObjectDoesNotExist` exception under certain conditions (regression from #11550)
|
* [#12367](https://github.com/netbox-community/netbox/issues/12367) - Fix `RelatedObjectDoesNotExist` exception under certain conditions (regression from #11550)
|
||||||
@ -15,6 +21,7 @@
|
|||||||
* [#12410](https://github.com/netbox-community/netbox/issues/12410) - Fix base path for OpenAPI schema (fixes Swagger UI requests)
|
* [#12410](https://github.com/netbox-community/netbox/issues/12410) - Fix base path for OpenAPI schema (fixes Swagger UI requests)
|
||||||
* [#12412](https://github.com/netbox-community/netbox/issues/12412) - Device/VM interface MAC addresses can be nullified via REST API
|
* [#12412](https://github.com/netbox-community/netbox/issues/12412) - Device/VM interface MAC addresses can be nullified via REST API
|
||||||
* [#12415](https://github.com/netbox-community/netbox/issues/12415) - Fix `ImportError` exception when running RQ worker
|
* [#12415](https://github.com/netbox-community/netbox/issues/12415) - Fix `ImportError` exception when running RQ worker
|
||||||
|
* [#12433](https://github.com/netbox-community/netbox/issues/12433) - Correct the application of URL query parameters for object list dashboard widgets
|
||||||
* [#12436](https://github.com/netbox-community/netbox/issues/12436) - Remove extraneous "add" button from contact assignments list
|
* [#12436](https://github.com/netbox-community/netbox/issues/12436) - Remove extraneous "add" button from contact assignments list
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -1900,6 +1900,7 @@ class PowerFeedFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet, PathEndpoi
|
|||||||
return queryset
|
return queryset
|
||||||
qs_filter = (
|
qs_filter = (
|
||||||
Q(name__icontains=value) |
|
Q(name__icontains=value) |
|
||||||
|
Q(power_panel__name__icontains=value) |
|
||||||
Q(comments__icontains=value)
|
Q(comments__icontains=value)
|
||||||
)
|
)
|
||||||
return queryset.filter(qs_filter)
|
return queryset.filter(qs_filter)
|
||||||
|
@ -298,6 +298,15 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilte
|
|||||||
|
|
||||||
|
|
||||||
class RackElevationFilterForm(RackFilterForm):
|
class RackElevationFilterForm(RackFilterForm):
|
||||||
|
fieldsets = (
|
||||||
|
(None, ('q', 'filter_id', 'tag')),
|
||||||
|
('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'id')),
|
||||||
|
('Function', ('status', 'role_id')),
|
||||||
|
('Hardware', ('type', 'width', 'serial', 'asset_tag')),
|
||||||
|
('Tenant', ('tenant_group_id', 'tenant_id')),
|
||||||
|
('Contacts', ('contact', 'contact_role', 'contact_group')),
|
||||||
|
('Weight', ('weight', 'max_weight', 'weight_unit')),
|
||||||
|
)
|
||||||
id = DynamicModelMultipleChoiceField(
|
id = DynamicModelMultipleChoiceField(
|
||||||
queryset=Rack.objects.all(),
|
queryset=Rack.objects.all(),
|
||||||
label=_('Rack'),
|
label=_('Rack'),
|
||||||
|
@ -229,7 +229,11 @@ class ObjectListWidget(DashboardWidget):
|
|||||||
htmx_url = reverse(viewname)
|
htmx_url = reverse(viewname)
|
||||||
except NoReverseMatch:
|
except NoReverseMatch:
|
||||||
htmx_url = None
|
htmx_url = None
|
||||||
if parameters := self.config.get('url_params'):
|
parameters = self.config.get('url_params') or {}
|
||||||
|
if page_size := self.config.get('page_size'):
|
||||||
|
parameters['per_page'] = page_size
|
||||||
|
|
||||||
|
if parameters:
|
||||||
try:
|
try:
|
||||||
htmx_url = f'{htmx_url}?{urlencode(parameters, doseq=True)}'
|
htmx_url = f'{htmx_url}?{urlencode(parameters, doseq=True)}'
|
||||||
except ValueError:
|
except ValueError:
|
||||||
@ -238,7 +242,6 @@ class ObjectListWidget(DashboardWidget):
|
|||||||
'viewname': viewname,
|
'viewname': viewname,
|
||||||
'has_permission': has_permission,
|
'has_permission': has_permission,
|
||||||
'htmx_url': htmx_url,
|
'htmx_url': htmx_url,
|
||||||
'page_size': self.config.get('page_size'),
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{% if htmx_url and has_permission %}
|
{% if htmx_url and has_permission %}
|
||||||
<div class="htmx-container" hx-get="{{ htmx_url }}{% if page_size %}?per_page={{ page_size }}{% endif %}" hx-trigger="load"></div>
|
<div class="htmx-container" hx-get="{{ htmx_url }}" hx-trigger="load"></div>
|
||||||
{% elif htmx_url %}
|
{% elif htmx_url %}
|
||||||
<div class="text-muted text-center">
|
<div class="text-muted text-center">
|
||||||
<i class="mdi mdi-lock-outline"></i> No permission to view this content.
|
<i class="mdi mdi-lock-outline"></i> No permission to view this content.
|
||||||
|
Loading…
Reference in New Issue
Block a user