From 042004e1ae952f1560bf7689dac71d554025c8fb Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 14 Feb 2022 15:28:43 +0000
Subject: [PATCH] Some cable list work

---
 assets/templates/cable_list.html              | 19 ++-----------------
 .../partials/asset_list_buttons.html          | 14 ++++++++++++++
 .../templates/partials/asset_list_table.html  | 14 +-------------
 assets/views.py                               |  1 +
 4 files changed, 18 insertions(+), 30 deletions(-)
 create mode 100644 assets/templates/partials/asset_list_buttons.html

diff --git a/assets/templates/cable_list.html b/assets/templates/cable_list.html
index 299ba6d1..f24fa4d4 100644
--- a/assets/templates/cable_list.html
+++ b/assets/templates/cable_list.html
@@ -1,5 +1,4 @@
 {% extends 'base_assets.html' %}
-{% load paginator from filters %}
 {% load button from filters %}
 {% load ids_from_objects from asset_tags %}
 {% load widget_tweaks %}
@@ -124,7 +123,6 @@
 </div>
 <div class="row">
     <div class="col px-0">
-    {% load button from filters %}
 <div class="table-responsive">
     <table class="table">
       <thead class="thead-dark">
@@ -145,22 +143,10 @@
                 <td class="assetDesc"><span class="text-truncate d-inline-block align-middle">{{ item.description }}</span></td>
                 <td class="assetCategory align-middle">{{ item.category }}</td>
                 <td class="assetStatus align-middle">{{ item.status }}</td>
-                <td>{{ item.length }}m</td>
+                <td style="background-color:{% if item.length == 20.0 %}#304486{% elif item.length == 10.0 %}green{%elif item.length == 5.0 %}red{% endif %} !important;">{{ item.length }}m</td>
                 <td>{{ item.cable_type }}</td>
                 <td class="d-none d-sm-table-cell">
-                    {% if audit %}
-                    <a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
-                    {% else %}
-                    <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_update' pk=item.asset_id clazz="btn-sm" %}
-                        {% endif %}
-                        {% if perms.assets.add_asset %}
-                            {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
-                        {% endif %}
-                    </div>
-                    {% endif %}
+                    {% include 'partials/asset_list_buttons.html' %}
                 </td>
             </tr>
             {% empty %}
@@ -173,5 +159,4 @@
 </div>
     </div>
 </div>
-{% paginator %}
 {% endblock %}
diff --git a/assets/templates/partials/asset_list_buttons.html b/assets/templates/partials/asset_list_buttons.html
new file mode 100644
index 00000000..0931eb8a
--- /dev/null
+++ b/assets/templates/partials/asset_list_buttons.html
@@ -0,0 +1,14 @@
+{% load button from filters %}
+{% if audit %}
+<a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
+{% else %}
+<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_update' pk=item.asset_id clazz="btn-sm" %}
+    {% endif %}
+    {% if perms.assets.add_asset %}
+        {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
+    {% endif %}
+</div>
+{% endif %}
diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html
index 43405bd9..d5963b00 100644
--- a/assets/templates/partials/asset_list_table.html
+++ b/assets/templates/partials/asset_list_table.html
@@ -18,19 +18,7 @@
                 <td class="assetCategory align-middle">{{ item.category }}</td>
                 <td class="assetStatus align-middle">{{ item.status }}</td>
                 <td class="d-none d-sm-table-cell">
-                    {% if audit %}
-                    <a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
-                    {% else %}
-                    <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_update' pk=item.asset_id clazz="btn-sm" %}
-                        {% endif %}
-                        {% if perms.assets.add_asset %}
-                            {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
-                        {% endif %}
-                    </div>
-                    {% endif %}
+                    {% include 'partials/asset_list_buttons.html' %}
                 </td>
             </tr>
             {% empty %}
diff --git a/assets/views.py b/assets/views.py
index 7c5fe16c..d940efdf 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -83,6 +83,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
 
 class CableList(AssetList):
     template_name = 'cable_list.html'
+    paginator = None
 
     def get_queryset(self):
         queryset = super().get_queryset().filter(is_cable=True)