From ea66342aa467666ef42b4da2643796dd34576181 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Sun, 31 Jan 2021 03:49:57 +0000
Subject: [PATCH] Fix cable type detail

---
 PyRIGS/tests/test_unit.py               |  4 +++
 assets/templates/cable_type_detail.html | 40 +++++++++++++++++++++
 assets/templates/cable_type_form.html   | 47 ++++---------------------
 assets/views.py                         |  2 +-
 4 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 assets/templates/cable_type_detail.html

diff --git a/PyRIGS/tests/test_unit.py b/PyRIGS/tests/test_unit.py
index aa4ebe0d..596d87c3 100644
--- a/PyRIGS/tests/test_unit.py
+++ b/PyRIGS/tests/test_unit.py
@@ -58,4 +58,8 @@ def test_page_titles(admin_client):
         response = admin_client.get(request_url)
         if hasattr(response, "context_data") and "page_title" in response.context_data:
             expected_title = response.context_data["page_title"]
+            # try:
             assertInHTML('<title>{} | Rig Information Gathering System'.format(expected_title), response.content.decode())
+            print("{} | {}".format(request_url, expected_title))  # If test fails, tell me where!
+            # except:
+            #    print(response.content.decode(), file=open('output.html', 'w'))
diff --git a/assets/templates/cable_type_detail.html b/assets/templates/cable_type_detail.html
new file mode 100644
index 00000000..c0e377c1
--- /dev/null
+++ b/assets/templates/cable_type_detail.html
@@ -0,0 +1,40 @@
+{% extends 'base_assets.html' %}
+{% load button from filters %}
+{% load cache %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="col">
+                <div class="card">
+                    <dl class="card-body row">
+                        <dt class="col-6">Socket</dt>
+                        <dd>{{ object.socket|default_if_none:'-' }}</dd>
+
+                        <dt class="col-6">Plug</dt>
+                        <dd>{{ object.plug|default_if_none:'-' }}</dd>
+
+                        <dt class="col-6">Circuits</dt>
+                        <dd>{{ object.circuits|default_if_none:'-' }}</dd>
+
+                        <dt class="col-6">Cores</dt>
+                        <dd>{{ object.cores|default_if_none:'-' }}</dd>
+                    </dl>
+                </div>
+            </div>
+            <div class="col mt-2 text-right">
+                {% button 'edit' url='cable_type_update' pk=object.id %}
+            </div>
+            {% cache None cable_type_assets object %}
+                <div class="col mt-2">
+                    <div class="card">
+                        <div class="card-header">Associated Assets</div>
+                        {% with object.asset_set.all as object_list %}
+                            {% include 'partials/asset_list_table.html' %}
+                        {% endwith %}
+                    </div>
+                </div>
+            {% endcache %}
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/assets/templates/cable_type_form.html b/assets/templates/cable_type_form.html
index fb7b5bbb..0589582e 100644
--- a/assets/templates/cable_type_form.html
+++ b/assets/templates/cable_type_form.html
@@ -14,47 +14,14 @@
 <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden="">
 <div class="row">
     <div class="col-sm-12">
-        {% if create or edit %}
-            {% for field in form %}
-                <div class="form-group">
-                    {% include 'partials/form_field.html' with field=field %}
-                </div>
-            {% endfor %}
-            <div class="text-right">
-                {% button 'submit' %}
+        {% for field in form %}
+            <div class="form-group">
+                {% include 'partials/form_field.html' with field=field %}
             </div>
-        {% else %}
-            <div class="col">
-                <div class="card">
-                    <dl class="card-body row">
-                        <dt class="col-6">Socket</dt>
-                        <dd>{{ object.socket|default_if_none:'-' }}</dd>
-
-                        <dt class="col-6">Plug</dt>
-                        <dd>{{ object.plug|default_if_none:'-' }}</dd>
-
-                        <dt class="col-6">Circuits</dt>
-                        <dd>{{ object.circuits|default_if_none:'-' }}</dd>
-
-                        <dt class="col-6">Cores</dt>
-                        <dd>{{ object.cores|default_if_none:'-' }}</dd>
-                    </dl>
-                </div>
-            </div>
-            <div class="col mt-2 text-right">
-                {% button 'edit' url='cable_type_update' pk=object.id %}
-            </div>
-            {% cache None cable_type_assets object %}
-                <div class="col mt-2">
-                    <div class="card">
-                        <div class="card-header">Associated Assets</div>
-                        {% with object.asset_set.all as object_list %}
-                            {% include 'partials/asset_list_table.html' %}
-                        {% endwith %}
-                    </div>
-                </div>
-            {% endcache %}
-        {% endif %}
+        {% endfor %}
+        <div class="text-right">
+            {% button 'submit' %}
+        </div>
     </div>
 </div>
 </form>
diff --git a/assets/views.py b/assets/views.py
index 5c1db0dd..c4367d53 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -314,7 +314,7 @@ class CableTypeList(generic.ListView):
 
 class CableTypeDetail(generic.DetailView):
     model = models.CableType
-    template_name = 'cable_type_form.html'
+    template_name = 'cable_type_detail.html'
 
     def get_context_data(self, **kwargs):
         context = super(CableTypeDetail, self).get_context_data(**kwargs)