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

Renamed PowerPort.power_outlet to connected_endpoint

Browse Source
This commit is contained in:
Jeremy Stretch
2018-10-24 11:00:13 -04:00
parent 1595a5ecd7
commit 2ec8dc8319
18 changed files with 158 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,7 +631,7 @@
</form>
{% endif %}
{% endif %}
{% if power_outlets or device.device_type.is_pdu %}
{% if poweroutlets or device.device_type.is_pdu %}
{% if perms.dcim.delete_poweroutlet %}
<form method="post">
{% csrf_token %}
@@ -652,7 +652,7 @@
</tr>
</thead>
<tbody>
{% for po in power_outlets %}
{% for po in poweroutlets %}
{% include 'dcim/inc/poweroutlet.html' %}
{% empty %}
<tr>
@@ -662,7 +662,7 @@
</tbody>
</table>
<div class="panel-footer">
{% if power_outlets and perms.dcim.change_powerport %}
{% if poweroutlets and perms.dcim.change_powerport %}
<button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
</button>
@@ -670,7 +670,7 @@
<span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
</button>
{% endif %}
{% if power_outlets and perms.dcim.delete_poweroutlet %}
{% if poweroutlets and perms.dcim.delete_poweroutlet %}
<button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' pk=device.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
</button>

18
netbox/templates/dcim/inc/poweroutlet.html
View File

@@ -1,4 +1,4 @@
<tr class="poweroutlet{% if po.connected_port and not po.connected_port.connection_status %} info{% endif %}">
<tr class="poweroutlet{% if po.connected_endpoint %} {% if po.connected_endpoint.connection_status %}success{% else %}info{% endif %}{% endif %}">
{% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
<td class="pk">
<input name="pk" type="checkbox" value="{{ po.pk }}" />
@@ -7,12 +7,12 @@
<td>
<i class="fa fa-fw fa-bolt"></i> {{ po }}
</td>
{% if po.connected_port %}
{% if po.connected_endpoint %}
<td>
<a href="{% url 'dcim:device' pk=po.connected_port.device.pk %}">{{ po.connected_port.device }}</a>
<a href="{% url 'dcim:device' pk=po.connected_endpoint.device.pk %}">{{ po.connected_endpoint.device }}</a>
</td>
<td>
{{ po.connected_port }}
{{ po.connected_endpoint }}
</td>
{% else %}
<td colspan="2">
@@ -21,13 +21,13 @@
{% endif %}
<td class="text-right">
{% if perms.dcim.change_poweroutlet %}
{% if po.connected_port %}
{% if po.connected_port.connection_status %}
<a href="#" class="btn btn-warning btn-xs powerport-toggle connected" title="Mark planned" data="{{ po.connected_port.pk }}">
{% if po.connected_endpoint %}
{% if po.connected_endpoint.connection_status %}
<a href="#" class="btn btn-warning btn-xs powerport-toggle connected" title="Mark planned" data="{{ po.connected_endpoint.pk }}">
<i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>
</a>
{% else %}
<a href="#" class="btn btn-success btn-xs powerport-toggle" title="Mark installed" data="{{ po.connected_port.pk }}">
<a href="#" class="btn btn-success btn-xs powerport-toggle" title="Mark installed" data="{{ po.connected_endpoint.pk }}">
<i class="fa fa-plug" aria-hidden="true"></i>
</a>
{% endif %}
@@ -44,7 +44,7 @@
</a>
{% endif %}
{% if perms.dcim.delete_poweroutlet %}
{% if po.connected_port %}
{% if po.connected_endpoint %}
<button class="btn btn-danger btn-xs" disabled="disabled">
<i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
</button>

12
netbox/templates/dcim/inc/powerport.html
View File

@@ -1,13 +1,13 @@
<tr class="powerport{% if pp.power_outlet and not pp.connection_status %} info{% endif %}">
<tr class="powerport{% if pp.connected_endpoint %} {% if pp.connection_status %}success{% else %}info{% endif %}{% endif %}">
<td>
<i class="fa fa-fw fa-bolt"></i> {{ pp }}
</td>
{% if pp.power_outlet %}
{% if pp.connected_endpoint %}
<td>
<a href="{% url 'dcim:device' pk=pp.power_outlet.device.pk %}">{{ pp.power_outlet.device }}</a>
<a href="{% url 'dcim:device' pk=pp.connected_endpoint.device.pk %}">{{ pp.connected_endpoint.device }}</a>
</td>
<td>
{{ pp.power_outlet }}
{{ pp.connected_endpoint }}
</td>
{% else %}
<td colspan="2">
@@ -16,7 +16,7 @@
{% endif %}
<td class="text-right">
{% if perms.dcim.change_powerport %}
{% if pp.power_outlet %}
{% if pp.connected_endpoint %}
{% if pp.connection_status %}
<a href="#" class="btn btn-warning btn-xs powerport-toggle connected" title="Mark planned" data="{{ pp.pk }}">
<i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>
@@ -39,7 +39,7 @@
</a>
{% endif %}
{% if perms.dcim.delete_powerport %}
{% if pp.power_outlet %}
{% if pp.connected_endpoint %}
<button class="btn btn-danger btn-xs" disabled="disabled">
<i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
</button>

2
netbox/templates/dcim/poweroutlet_disconnect.html
View File

@@ -4,5 +4,5 @@
{% block title %}Disconnect {{ poweroutlet.device }} {{ poweroutlet }}?{% endblock %}
{% block message %}
<p>Are you sure you want to disconnect {{ poweroutlet.connected_port.device }} {{ poweroutlet.connected_port }} from this port?</p>
<p>Are you sure you want to disconnect {{ poweroutlet.connected_endpoint.device }} {{ poweroutlet.connected_endpoint }} from this port?</p>
{% endblock %}

2
netbox/templates/dcim/powerport_connect.html
View File

@@ -35,7 +35,7 @@
{% render_field form.pdu %}
</div>
</div>
{% render_field form.power_outlet %}
{% render_field form.connected_endpoint %}
{% render_field form.connection_status %}
</div>
</div>

2
netbox/templates/dcim/powerport_disconnect.html
View File

@@ -4,5 +4,5 @@
{% block title %}Disconnect power port {{ powerport }}?{% endblock %}
{% block message %}
<p>Are you sure you want to disconnect this power port from {{ powerport.power_outlet.device }} {{ powerport.power_outlet }}?</p>
<p>Are you sure you want to disconnect this power port from {{ powerport.connected_endpoint.device }} {{ powerport.connected_endpoint }}?</p>
{% endblock %}