arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-24 08:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix unclosed tags in asset_update

Browse Source
This commit is contained in:
FreneticScribbler
2019-10-02 18:58:52 +01:00
parent 6c68343653
commit 3d7fc18fb7
1 changed files with 47 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
assets/templates/asset_update.html
View File

@@ -34,9 +34,9 @@
Asset Details Asset Details
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% if edit or duplicate %}
<div class="form-group"> <div class="form-group">
<label for="{{ form.asset_id.id_for_label }}">Asset ID</label> <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
{% if edit or duplicate %}
{% if duplicate %} {% if duplicate %}
{% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
{% elif object.asset_id %} {% elif object.asset_id %}
@@ -45,7 +45,6 @@
{% render_field form.asset_id|add_class:'form-control' %} {% render_field form.asset_id|add_class:'form-control' %}
{% endif %} {% endif %}
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="{{ form.description.id_for_label }}" <label for="{{ form.description.id_for_label }}"
>Description</label> >Description</label>
@@ -107,7 +106,6 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% if edit or duplicate %} {% if edit or duplicate %}
<div class="form-group"> <div class="form-group">
<label for="{{ form.purchased_from.id_for_label }}">Purchased From</label> <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
<select class="form-control" name="{{ form.purchased_from.name }}" <select class="form-control" name="{{ form.purchased_from.name }}"
@@ -151,57 +149,33 @@
<label for="{{ form.date_sold.id_for_label }}">Date Sold</label> <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
{% render_field form.date_sold|add_class:'datepicker form-control' value=object.date_sold|date %} {% render_field form.date_sold|add_class:'datepicker form-control' value=object.date_sold|date %}
</div> </div>
{% else %}
<dl>
<dt>Purchased From</dt>
<dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
<dt>Purchase Price</dt>
<dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
<dt>Salvage Value</dt>
<dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
<dt>Date Acquired</dt>
<dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
<dt>Date Sold</dt>
<dd>{{ object.date_sold|default_if_none:'-' }}</dd>
</dl>
{% endif %}
</div> </div>
{% else %}
<dt>Purchased From</dt>
<dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
<dt>Purchase Price</dt>
<dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
<dt>Salvage Value</dt>
<dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
<dt>Date Acquired</dt>
<dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
<dt>Date Sold</dt>
<dd>{{ object.date_sold|default_if_none:'-' }}</dd>
{% endif %}
</dl>
</div> </div>
</div>
{% if object.is_cable %} <div class="panel panel-default">
<div class="form-group">
<div class="panel">
<div class="panel-heading"> <div class="panel-heading">
Cable Details Collection Details
</div> </div>
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal">
<dt>Length</dt>
<dd>{{ object.length }}m</dd>
<dt>Type</dt>
<dd>TODO</dd>
<dt>Required CSA</dt>
<dd>TODO</dd>
</dl>
</div>
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading">
Collection Details
</div>
<div class="panel-body">
<dl class="dl-horizontal">
{% if edit or duplicate %} {% if edit or duplicate %}
<div class="form-group"> <div class="form-group">
<label for="parent_id">Parent</label> <label for="parent_id">Parent</label>
<input type="hidden" name="{{ form.parent.html_name }}" id="hidden_parent_id" <input type="hidden" name="{{ form.parent.html_name }}" id="hidden_parent_id"
@@ -230,34 +204,35 @@
<div class="col s12" id="formAssetSearchResult"> <div class="col s12" id="formAssetSearchResult">
<!--Placeholder for search results--> <!--Placeholder for search results-->
</div> </div>
</div>
{% else %}
<dt>Parent</dt>
<dd>
{% if object.parent %}
<a href="{% url 'asset_detail' object.parent.pk %}">
{{ object.parent.asset_id }} - {{ object.parent.description }}
</a>
{% else %} {% else %}
<span>-</span> <dl>
{% endif %} <dt>Parent</dt>
</dd> <dd>
{% if object.parent %}
<a href="{% url 'asset_detail' object.parent.pk %}">
{{ object.parent.asset_id }} - {{ object.parent.description }}
</a>
{% else %}
<span>-</span>
{% endif %}
</dd>
<dt>Children</dt> <dt>Children</dt>
{% if object.asset_parent.all %} {% if object.asset_parent.all %}
{% for child in object.asset_parent.all %} {% for child in object.asset_parent.all %}
<dd> <dd>
<a href="{% url 'asset_detail' child.pk %}"> <a href="{% url 'asset_detail' child.pk %}">
{{ child.asset_id }} - {{ child.description }} {{ child.asset_id }} - {{ child.description }}
</a> </a>
</dd> </dd>
{% endfor %} {% endfor %}
{% else %} {% else %}
<dd><span>-</span></dd> <dd><span>-</span></dd>
{% endif %}
</dl>
{% endif %} {% endif %}
{% endif %} </div>
</dl> </div>
</div>
</form> </form>
{% include 'partials/asset_buttons.html' %} {% include 'partials/asset_buttons.html' %}