NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 08:46:10 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Jeremy Stretch 2023-07-31 14:15:22 -04:00
parent afd5c46722
commit e0d80bd168
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/tables/power.py
View File

@ -33,7 +33,7 @@ class PowerPanelTable(ContactsColumnMixin, NetBoxTable):
powerfeed_count = columns.LinkedCountColumn( powerfeed_count = columns.LinkedCountColumn(
viewname='dcim:powerfeed_list', viewname='dcim:powerfeed_list',
url_params={'power_panel_id': 'pk'}, url_params={'power_panel_id': 'pk'},
verbose_name=_('Feeds') verbose_name=_('Power Feeds')
) )
comments = columns.MarkdownColumn( comments = columns.MarkdownColumn(
verbose_name=_('Comments'), verbose_name=_('Comments'),

4
netbox/extras/tables/tables.py
View File

@ -79,7 +79,7 @@ class CustomFieldTable(NetBoxTable):
) )
choice_set = tables.Column( choice_set = tables.Column(
linkify=True, linkify=True,
verbose_name=_('Choice set') verbose_name=_('Choice Set')
) )
choices = columns.ChoicesColumn( choices = columns.ChoicesColumn(
max_items=10, max_items=10,
@ -468,7 +468,7 @@ class JournalEntryTable(NetBoxTable):
format=settings.SHORT_DATETIME_FORMAT format=settings.SHORT_DATETIME_FORMAT
) )
assigned_object_type = columns.ContentTypeColumn( assigned_object_type = columns.ContentTypeColumn(
verbose_name=_('Object type') verbose_name=_('Object Type')
) )
assigned_object = tables.Column( assigned_object = tables.Column(
linkify=True, linkify=True,

2
netbox/ipam/tables/ip.py
View File

@ -371,7 +371,7 @@ class IPAddressTable(TenancyColumnsMixin, NetBoxTable):
accessor='assigned_object__parent_object', accessor='assigned_object__parent_object',
linkify=True, linkify=True,
orderable=False, orderable=False,
verbose_name=_('Device/VM') verbose_name=_('Parent')
) )
nat_inside = tables.Column( nat_inside = tables.Column(
linkify=True, linkify=True,

2
netbox/ipam/tables/vlans.py
View File

@ -207,7 +207,7 @@ class InterfaceVLANTable(NetBoxTable):
""" """
vid = tables.Column( vid = tables.Column(
linkify=True, linkify=True,
verbose_name=_('ID') verbose_name=_('VID')
) )
tagged = columns.BooleanColumn( tagged = columns.BooleanColumn(
verbose_name=_('Tagged'), verbose_name=_('Tagged'),

3
netbox/netbox/tables/columns.py
View File

@ -171,7 +171,8 @@ class ToggleColumn(tables.CheckBoxColumn):
@property @property
def header(self): def header(self):
return mark_safe('<input type="checkbox" class="toggle form-check-input" title=_("Toggle All") />') title_text = _('Toggle all')
return mark_safe(f'<input type="checkbox" class="toggle form-check-input" title="{title_text}" />')
class BooleanColumn(tables.Column): class BooleanColumn(tables.Column):

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

@ -170,15 +170,13 @@ class NetBoxTable(BaseTable):
* Actions * Actions
""" """
pk = columns.ToggleColumn( pk = columns.ToggleColumn(
verbose_name=_('Pk'),
visible=False visible=False
) )
id = tables.Column( id = tables.Column(
linkify=True, linkify=True,
verbose_name=_('ID') verbose_name=_('ID')
) )
actions = columns.ActionsColumn( actions = columns.ActionsColumn()
)
exempt_columns = ('pk', 'actions') exempt_columns = ('pk', 'actions')