NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 02:06:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Template and table polish

Browse Source
This commit is contained in:
Jeremy Stretch 2019-03-22 21:58:45 -04:00
parent 681e20133a
commit a208cd156d
4 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/dcim/tables.py
View File

@ -818,8 +818,11 @@ class PowerFeedTable(BaseTable):
name = tables.LinkColumn() name = tables.LinkColumn()
power_panel = tables.LinkColumn( power_panel = tables.LinkColumn(
viewname='dcim:powerpanel', viewname='dcim:powerpanel',
args=[Accessor('power_panel.pk')], args=[Accessor('rack.pk')],
)
rack = tables.LinkColumn(
viewname='dcim:rack',
args=[Accessor('pk')]
) )
status = tables.TemplateColumn( status = tables.TemplateColumn(
template_code=STATUS_LABEL template_code=STATUS_LABEL

6
netbox/dcim/views.py
View File

@ -2198,9 +2198,15 @@ class PowerPanelView(View):
def get(self, request, pk): def get(self, request, pk):
powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk)
powerfeed_table = tables.PowerFeedTable(
data=PowerFeed.objects.filter(power_panel=powerpanel).select_related('rack'),
orderable=False
)
powerfeed_table.exclude = ['power_panel']
return render(request, 'dcim/powerpanel.html', { return render(request, 'dcim/powerpanel.html', {
'powerpanel': powerpanel, 'powerpanel': powerpanel,
'powerfeed_table': powerfeed_table,
}) })

21
netbox/templates/dcim/powerfeed.html
View File

@ -48,7 +48,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<strong>Power Feed</strong> <strong>Power Feed</strong>
@ -82,6 +82,25 @@
<span class="label label-{{ powerfeed.get_status_class }}">{{ powerfeed.get_status_display }}</span> <span class="label label-{{ powerfeed.get_status_class }}">{{ powerfeed.get_status_display }}</span>
</td> </td>
</tr> </tr>
<tr>
<td>Connected Device</td>
<td>
{% if powerfeed.connected_endpoint %}
<a href="{{ powerfeed.connected_endpoint.device.get_absolute_url }}">{{ powerfeed.connected_endpoint.device }}</a> ({{ powerfeed.connected_endpoint }})
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
</tr>
</table>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Electrical Characteristics</strong>
</div>
<table class="table table-hover panel-body attr-table">
<tr> <tr>
<td>Supply</td> <td>Supply</td>
<td>{{ powerfeed.get_supply_display }}</td> <td>{{ powerfeed.get_supply_display }}</td>

7
netbox/templates/dcim/powerpanel.html
View File

@ -48,7 +48,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-3">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<strong>Power Panel</strong> <strong>Power Panel</strong>
@ -73,7 +73,8 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
</div> {% include 'panel_table.html' with table=powerfeed_table heading='Connected Feeds' %}
</div>
</div> </div>
{% endblock %} {% endblock %}