From ecdb3834ce2bc8abc9ad7d27e50e1789b9a782a6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 10 Oct 2024 10:00:22 -0400 Subject: [PATCH] Clean up DistanceColumn --- netbox/netbox/tables/columns.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index ec5314247..ee1420396 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -694,20 +694,14 @@ class ChoicesColumn(tables.Column): return ', '.join(value) -class DistanceColumn(tables.TemplateColumn): +class DistanceColumn(TemplateColumn): """ Distance with template code for formatting """ template_code = """ - {% load helpers %} - {% if record.distance %}{{ record.distance|floatformat:"-2" }} {{ record.distance_unit }}{% endif %} - """ + {% load helpers %} + {% if record.distance %}{{ record.distance|floatformat:"-2" }} {{ record.distance_unit }}{% endif %} + """ - def __init__(self, *args, **kwargs): - super().__init__( - template_code=self.template_code, - order_by=('_abs_distance'), - *args, **kwargs) - - def value(self, value): - return value + def __init__(self, template_code=template_code, order_by='_abs_distance', **kwargs): + super().__init__(template_code=template_code, order_by=order_by, **kwargs)