mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2022-01-11 16:16:13 -05:00
parent 21e0e6e495 b584f09223
commit c8713d94d8
73 changed files with 582 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/utilities/tables/columns.py
View File

@ -130,7 +130,7 @@ class ActionsColumn(tables.Column):
def render(self, record, table, **kwargs):
# Skip dummy records (e.g. available VLANs) or those with no actions
if not hasattr(record, 'pk') or not self.actions:
if not getattr(record, 'pk', None) or not self.actions:
return ''
model = table.Meta.model
@ -236,15 +236,15 @@ class ColoredLabelColumn(tables.TemplateColumn):
Render a colored label (e.g. for DeviceRoles).
"""
template_code = """
{% load helpers %}
{% if value %}
<span class="badge" style="color: {{ value.color|fgcolor }}; background-color: #{{ value.color }}">
{{ value }}
</span>
{% else %}
&mdash;
{% endif %}
"""
{% load helpers %}
{% if value %}
<span class="badge" style="color: {{ value.color|fgcolor }}; background-color: #{{ value.color }}">
<a href="{{ value.get_absolute_url }}">{{ value }}</a>
</span>
{% else %}
&mdash;
{% endif %}
"""
def __init__(self, *args, **kwargs):
super().__init__(template_code=self.template_code, *args, **kwargs)