mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-14 01:41:22 -06:00
Merge branch 'develop' into 3898-cable-str-pk
This commit is contained in:
commit
736cd709d9
@ -15,6 +15,7 @@
|
|||||||
* [#3668](https://github.com/netbox-community/netbox/issues/3668) - Search by DNS name when assigning IP address
|
* [#3668](https://github.com/netbox-community/netbox/issues/3668) - Search by DNS name when assigning IP address
|
||||||
* [#3851](https://github.com/netbox-community/netbox/issues/3851) - Allow passing initial data to custom script forms
|
* [#3851](https://github.com/netbox-community/netbox/issues/3851) - Allow passing initial data to custom script forms
|
||||||
* [#3891](https://github.com/netbox-community/netbox/issues/3891) - Add `local_context_data` filter for virtual machines
|
* [#3891](https://github.com/netbox-community/netbox/issues/3891) - Add `local_context_data` filter for virtual machines
|
||||||
|
* [#3902](https://github.com/netbox-community/netbox/issues/3902) - Relax the non-essential required fields when connecting cable to circuit or power feed
|
||||||
|
|
||||||
## Bug Fixes
|
## Bug Fixes
|
||||||
|
|
||||||
@ -29,6 +30,7 @@
|
|||||||
* [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page
|
* [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page
|
||||||
* [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group
|
* [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group
|
||||||
* [#3898](https://github.com/netbox-community/netbox/issues/3898) - Fix deleted message being set to None for cable
|
* [#3898](https://github.com/netbox-community/netbox/issues/3898) - Fix deleted message being set to None for cable
|
||||||
|
* [#3905](https://github.com/netbox-community/netbox/issues/3905) - Fix divide-by-zero on power feeds with low power values
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -739,7 +739,7 @@ class RackElevationFilterForm(RackFilterForm):
|
|||||||
|
|
||||||
# Filter the rack field based on the site and group
|
# Filter the rack field based on the site and group
|
||||||
self.fields['site'].widget.add_filter_for('id', 'site')
|
self.fields['site'].widget.add_filter_for('id', 'site')
|
||||||
self.fields['rack_group_id'].widget.add_filter_for('id', 'group_id')
|
self.fields['group_id'].widget.add_filter_for('id', 'group_id')
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -2804,6 +2804,7 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, f
|
|||||||
termination_b_provider = forms.ModelChoiceField(
|
termination_b_provider = forms.ModelChoiceField(
|
||||||
queryset=Provider.objects.all(),
|
queryset=Provider.objects.all(),
|
||||||
label='Provider',
|
label='Provider',
|
||||||
|
required=False,
|
||||||
widget=APISelect(
|
widget=APISelect(
|
||||||
api_url='/api/circuits/providers/',
|
api_url='/api/circuits/providers/',
|
||||||
filter_for={
|
filter_for={
|
||||||
@ -2857,6 +2858,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode
|
|||||||
termination_b_site = forms.ModelChoiceField(
|
termination_b_site = forms.ModelChoiceField(
|
||||||
queryset=Site.objects.all(),
|
queryset=Site.objects.all(),
|
||||||
label='Site',
|
label='Site',
|
||||||
|
required=False,
|
||||||
widget=APISelect(
|
widget=APISelect(
|
||||||
api_url='/api/dcim/sites/',
|
api_url='/api/dcim/sites/',
|
||||||
display_field='cid',
|
display_field='cid',
|
||||||
@ -2888,6 +2890,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode
|
|||||||
('rack_group', 'termination_b_rackgroup'),
|
('rack_group', 'termination_b_rackgroup'),
|
||||||
),
|
),
|
||||||
label='Power Panel',
|
label='Power Panel',
|
||||||
|
required=False,
|
||||||
widget=APISelect(
|
widget=APISelect(
|
||||||
api_url='/api/dcim/power-panels/',
|
api_url='/api/dcim/power-panels/',
|
||||||
filter_for={
|
filter_for={
|
||||||
|
@ -112,7 +112,9 @@
|
|||||||
{% if utilization %}
|
{% if utilization %}
|
||||||
<td>
|
<td>
|
||||||
{{ utilization.allocated }}VA / {{ powerfeed.available_power }}VA
|
{{ utilization.allocated }}VA / {{ powerfeed.available_power }}VA
|
||||||
{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}
|
{% if powerfeed.available_power > 0 %}
|
||||||
|
{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td class="text-muted">N/A</td>
|
<td class="text-muted">N/A</td>
|
||||||
|
Loading…
Reference in New Issue
Block a user