NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-27 01:36:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Replace custom simplify_decimal filter with floatformat

Browse Source
This commit is contained in:
jeremystretch 2023-04-13 17:06:46 -04:00
parent 134dc70a4d
commit 8d326a841a
4 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/tables/template_code.py
View File

@ -12,12 +12,12 @@ LINKTERMINATION = """
CABLE_LENGTH = """ CABLE_LENGTH = """
{% load helpers %} {% load helpers %}
{% if record.length %}{{ record.length|simplify_decimal }} {{ record.length_unit }}{% endif %} {% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %}
""" """
WEIGHT = """ WEIGHT = """
{% load helpers %} {% load helpers %}
{% if value %}{{ value|simplify_decimal }} {{ record.weight_unit }}{% endif %} {% if value %}{{ value|floatformat:"-2" }} {{ record.weight_unit }}{% endif %}
""" """
DEVICE_LINK = """ DEVICE_LINK = """

8
netbox/templates/dcim/interface.html
View File

@ -242,7 +242,7 @@
<th scope="row">Channel Frequency</th> <th scope="row">Channel Frequency</th>
<td> <td>
{% if object.rf_channel_frequency %} {% if object.rf_channel_frequency %}
{{ object.rf_channel_frequency|simplify_decimal }} MHz {{ object.rf_channel_frequency|floatformat:"-2" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}
@ -250,7 +250,7 @@
{% if peer %} {% if peer %}
<td{% if peer.rf_channel_frequency != object.rf_channel_frequency %} class="text-danger"{% endif %}> <td{% if peer.rf_channel_frequency != object.rf_channel_frequency %} class="text-danger"{% endif %}>
{% if peer.rf_channel_frequency %} {% if peer.rf_channel_frequency %}
{{ peer.rf_channel_frequency|simplify_decimal }} MHz {{ peer.rf_channel_frequency|floatformat:"-2" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}
@ -261,7 +261,7 @@
<th scope="row">Channel Width</th> <th scope="row">Channel Width</th>
<td> <td>
{% if object.rf_channel_width %} {% if object.rf_channel_width %}
{{ object.rf_channel_width|simplify_decimal }} MHz {{ object.rf_channel_width|floatformat:"-3" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}
@ -269,7 +269,7 @@
{% if peer %} {% if peer %}
<td{% if peer.rf_channel_width != object.rf_channel_width %} class="text-danger"{% endif %}> <td{% if peer.rf_channel_width != object.rf_channel_width %} class="text-danger"{% endif %}>
{% if peer.rf_channel_width %} {% if peer.rf_channel_width %}
{{ peer.rf_channel_width|simplify_decimal }} MHz {{ peer.rf_channel_width|floatformat:"-3" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}

4
netbox/templates/wireless/inc/wirelesslink_interface.html
View File

@ -31,7 +31,7 @@
<th scope="row">Channel Frequency</th> <th scope="row">Channel Frequency</th>
<td> <td>
{% if interface.rf_channel_frequency %} {% if interface.rf_channel_frequency %}
{{ interface.rf_channel_frequency|simplify_decimal }} MHz {{ interface.rf_channel_frequency|floatformat:"-2" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}
@ -41,7 +41,7 @@
<th scope="row">Channel Width</th> <th scope="row">Channel Width</th>
<td> <td>
{% if interface.rf_channel_width %} {% if interface.rf_channel_width %}
{{ interface.rf_channel_width|simplify_decimal }} MHz {{ interface.rf_channel_width|floatformat:"-3" }} MHz
{% else %} {% else %}
{{ ''|placeholder }} {{ ''|placeholder }}
{% endif %} {% endif %}

14
netbox/utilities/templatetags/helpers.py
View File

@ -30,7 +30,6 @@ __all__ = (
'meters_to_feet', 'meters_to_feet',
'percentage', 'percentage',
'querystring', 'querystring',
'simplify_decimal',
'startswith', 'startswith',
'status_from_tag', 'status_from_tag',
'table_config_form', 'table_config_form',
@ -107,19 +106,6 @@ def humanize_megabytes(mb):
return f'{mb} MB' return f'{mb} MB'
@register.filter()
def simplify_decimal(value):
"""
Return the simplest expression of a decimal value. Examples:
1.00 => '1'
1.20 => '1.2'
1.23 => '1.23'
"""
if type(value) is not decimal.Decimal:
return value
return str(value).rstrip('0').rstrip('.')
@register.filter(expects_localtime=True) @register.filter(expects_localtime=True)
def annotated_date(date_value): def annotated_date(date_value):
""" """