diff --git a/assets/models.py b/assets/models.py index bf662ccc..37af4687 100644 --- a/assets/models.py +++ b/assets/models.py @@ -49,7 +49,7 @@ class Supplier(models.Model, RevisionMixin): ordering = ['name'] def get_absolute_url(self): - return reverse('supplier_list') + return reverse('supplier_detail', kwargs={'pk': self.pk}) def __str__(self): return self.name @@ -82,6 +82,9 @@ class CableType(models.Model): else: return "Unknown" + def get_absolute_url(self): + return reverse('cable_type_detail', kwargs={'pk': self.pk}) + def get_available_asset_id(wanted_prefix=""): sql = """ diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html index c5c4f5ff..5799bc35 100644 --- a/assets/templates/partials/cable_form.html +++ b/assets/templates/partials/cable_form.html @@ -17,11 +17,9 @@ {% else %}
Cable Type
-
{{ object.cable_type|default_if_none:'-' }}
- +
{% if object.cable_type %}{{ object.cable_type }}{%else%}-{%endif%}
Length
{{ object.length|default_if_none:'-' }}m
-
Cross Sectional Area
{{ object.csa|default_if_none:'-' }}mm²
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html index 24a373dd..02501431 100644 --- a/assets/templates/partials/purchasedetails_form.html +++ b/assets/templates/partials/purchasedetails_form.html @@ -1,4 +1,5 @@ {% load widget_tweaks %} +{% load linkornone from filters %}
Purchase Details @@ -51,14 +52,11 @@ {% else %}
Purchased From
-
{{ object.purchased_from|default_if_none:'-' }}
- +
{% if object.purchased_from %}{{ object.purchased_from }}{%else%}-{%endif%}
Purchase Price
£{{ object.purchase_price|default_if_none:'-' }}
-
Salvage Value
£{{ object.salvage_value|default_if_none:'-' }}
-
Date Acquired
{{ object.date_acquired|default_if_none:'-' }}
{% if object.date_sold %}