From 5a5bb4328df03baa62653e7986feb693fc1a8059 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 10 Oct 2020 10:24:04 +0100
Subject: [PATCH] Minor typo fixes

---
 assets/templates/cable_type_form.html         | 33 +++++--------------
 .../templates/partials/asset_list_table.html  |  4 +--
 assets/views.py                               |  7 ++++
 versioning/versioning.py                      |  2 +-
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/assets/templates/cable_type_form.html b/assets/templates/cable_type_form.html
index 3f44ed71..42b5f024 100644
--- a/assets/templates/cable_type_form.html
+++ b/assets/templates/cable_type_form.html
@@ -1,13 +1,8 @@
 {% extends 'base_assets.html' %}
 {% load widget_tweaks %}
-{% block title %}Cable Type{% endblock %}
+{% load button from filters %}
 
 {% block content %}
-<div class="page-header">
-  <h1>
-      {% if create %}Create{% elif edit %}Edit{% endif %} Cable Type
-  </h1>
-</div>
 {% if create %}
 <form method="POST" action="{% url 'cable_type_create'%}">
 {% elif edit %}
@@ -19,26 +14,13 @@
 <div class="row">
   <div class="col-sm-12">
     {% if create or edit %}
+    {% for field in form %}
     <div class="form-group">
-      <label for="{{ form.plug.id_for_label }}">Plug</label>
-      {% render_field form.plug|add_class:'form-control'%}
+      {% include 'partials/form_field.html' with field=field %}
     </div>
-    <div class="form-group">
-      <label for="{{ form.socket.id_for_label }}">Socket</label>
-      {% render_field form.socket|add_class:'form-control'%}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.circuits.id_for_label }}">Circuits</label>
-      {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.cores.id_for_label }}">Cores</label>
-      {% render_field form.cores|add_class:'form-control' value=object.cores %}
-    </div>
-    <div class="pull-left">
-        <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-        <br>
-        <button type="reset" class="btn btn-link">Cancel</button>
+    {% endfor %}
+    <div class="text-right">
+        {% button 'submit' %}
     </div>
     {% else %}
     <dl>
@@ -54,6 +36,9 @@
       <dt>Cores</dt>
       <dd>{{ object.cores|default_if_none:'-' }}</dd>
     </dl>
+    <div class="text-right">
+    {% button 'edit' url='cable_type_update' pk=object.id %}
+    </div>
     {% endif %}
   </div>
 </div>
diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html
index ed6164b4..a559bdd0 100644
--- a/assets/templates/partials/asset_list_table.html
+++ b/assets/templates/partials/asset_list_table.html
@@ -24,8 +24,8 @@
                     <div class="btn-group" role="group">
                         {% button 'view' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
                         {% if perms.assets.change_asset %}
-                            {% button 'edit' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
-                            {% button 'duplicate' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
+                            {% button 'edit' url='asset_update' pk=item.asset_id clazz="btn-sm" %}
+                            {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
                         {% endif %}
                     </div>
                     {% endif %}
diff --git a/assets/views.py b/assets/views.py
index 80314e9f..535084da 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -297,6 +297,11 @@ class CableTypeDetail(generic.DetailView):
     model = models.CableType
     template_name = 'cable_type_form.html'
 
+    def get_context_data(self, **kwargs):
+        context = super(CableTypeDetail, self).get_context_data(**kwargs)
+        context["page_title"] = "Cable Type {}".format(str(self.object))
+        return context
+
 
 class CableTypeCreate(generic.CreateView):
     model = models.CableType
@@ -306,6 +311,7 @@ class CableTypeCreate(generic.CreateView):
     def get_context_data(self, **kwargs):
         context = super(CableTypeCreate, self).get_context_data(**kwargs)
         context["create"] = True
+        context["page_title"] = "Create Cable Type"
 
         return context
 
@@ -321,6 +327,7 @@ class CableTypeUpdate(generic.UpdateView):
     def get_context_data(self, **kwargs):
         context = super(CableTypeUpdate, self).get_context_data(**kwargs)
         context["edit"] = True
+        context["page_title"] = "Edit Cable Type"
 
         return context
 
diff --git a/versioning/versioning.py b/versioning/versioning.py
index f36dde6b..dead9a71 100644
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -128,7 +128,7 @@ class ModelComparison(object):
             old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type)
             new_item_versions = self.version.revision.version_set.exclude(content_type=item_type).exclude(content_type=ContentType.objects.get_for_model(models.EventAuthorisation))
 
-            comparisonParams = {'excluded_keys': ['id', 'event', 'order']}
+            comparisonParams = {'excluded_keys': ['id', 'event', 'order', 'checklist']}
 
             # Build some dicts of what we have
             item_dict = {}  # build a list of items, key is the item_pk