Cables are now a thing, unfortunately by making a monolithic Asset model

Co-authored-by: Arona Jones <aj@aronajones.com>
This commit is contained in:
Matthew Smith
2019-10-14 00:05:18 +01:00
parent b7e14b7dc3
commit aac900318e
9 changed files with 162 additions and 119 deletions

View File

@@ -35,7 +35,8 @@
<div class="col-md-6">
{% include 'partials/purchasedetails_form.html' %}
</div>
<div class="col-md-6" hidden="true" id="cable-table">
<div class="col-md-6"
{% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
{% include 'partials/cable_form.html' %}
</div>
<div class="col-md-4">
@@ -54,6 +55,7 @@
{% endblock %}
{% block js%}
{% if edit %}
<script>
function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) {
@@ -64,4 +66,5 @@
}
checkIfCableHidden();
</script>
{%endblock%}
{% endif %}
{% endblock %}

View File

@@ -1,7 +1,7 @@
{% if edit and object %}
<!--edit-->
<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
<a class="btn btn-default" href="{% url 'asset_detail' previous_asset_pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
<a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
{% elif duplicate %}
<!--duplicate-->

View File

@@ -9,7 +9,7 @@
<div class="form-group">
<label for="{{ form.plug.id_for_label }}">Plug</label>
<select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
<option value="None">
<option value="">
{% for connector in connectors %}
<option value="{{ connector.pk }}">
{{ connector.description }}
@@ -20,7 +20,7 @@
<div class="form-group">
<label for="{{ form.socket.id_for_label }}">Socket</label>
<select name="{{ form.socket.name }}" id="{{ form.socket.id_for_label }}" class="form-control">
<option value="None">
<option value="">
{% for connector in connectors %}
<option value="{{ connector.pk }}">
{{ connector.description }}