From 526d81481bd8021090213a3c72fc8803561cdf29 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 18 Jan 2021 22:25:53 +1100
Subject: [PATCH] Cleanup

---
 InvenTree/part/models.py                      |  3 -
 InvenTree/part/templates/part/bom-delete.html |  5 +-
 InvenTree/part/templates/part/bom-detail.html | 18 -----
 InvenTree/part/templates/part/bom.html        | 10 +--
 .../part/bom_upload/select_parts.html         |  4 +-
 InvenTree/part/templates/part/category.html   |  6 +-
 InvenTree/part/templates/part/copy_part.html  |  5 +-
 .../part/templates/part/variant_part.html     |  5 +-
 InvenTree/part/urls.py                        |  2 -
 InvenTree/part/views.py                       |  9 ---
 InvenTree/templates/js/bom.js                 | 66 +++++++++----------
 11 files changed, 51 insertions(+), 82 deletions(-)
 delete mode 100644 InvenTree/part/templates/part/bom-detail.html

diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index a45220c7ab..f35cc98d39 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -1856,9 +1856,6 @@ class BomItem(models.Model):
         self.clean()
         super().save(*args, **kwargs)
 
-    def get_absolute_url(self):
-        return reverse('bom-item-detail', kwargs={'pk': self.id})
-
     # A link to the parent part
     # Each part will get a reverse lookup field 'bom_items'
     part = models.ForeignKey(Part, on_delete=models.CASCADE, related_name='bom_items',
diff --git a/InvenTree/part/templates/part/bom-delete.html b/InvenTree/part/templates/part/bom-delete.html
index ffaf2c57e5..2b8c5a18e1 100644
--- a/InvenTree/part/templates/part/bom-delete.html
+++ b/InvenTree/part/templates/part/bom-delete.html
@@ -1,10 +1,11 @@
+{% load i18n %}
 {% extends "modal_delete_form.html" %}
 
 {% block pre_form_content %}
 
-Are you sure you want to delete this BOM item?
+{% trans "Are you sure you want to delete this BOM item?" %}
 <br>
-Deleting this entry will remove the BOM row from the following part:
+{% trans "Deleting this entry will remove the BOM row from the following part" %}:
 
 <ul class='list-group'>
     <li class='list-group-item'>
diff --git a/InvenTree/part/templates/part/bom-detail.html b/InvenTree/part/templates/part/bom-detail.html
deleted file mode 100644
index 2c4fb7e09d..0000000000
--- a/InvenTree/part/templates/part/bom-detail.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-<h3>BOM Item</h3>
-<table class="table table-striped">
-    <tr><td>Parent</td><td><a href="{% url 'part-bom' item.part.id %}">{{ item.part.full_name }}</a></td></tr>
-    <tr><td>Child</td><td><a href="{% url 'part-used-in' item.sub_part.id %}">{{ item.sub_part.full_name }}</a></td></tr>
-    <tr><td>Quantity</td><td>{{ item.quantity }}</td></tr>
-</table>
-
-<div class='container-fluid'>
-    <a href="{% url 'bom-item-edit' item.id %}"><button class="btn btn-info">Edit BOM item</button></a>
-
-    <a href="{% url 'bom-item-delete' item.id %}"><button class="btn btn-danger">Delete BOM item</button></a>
-</div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 0b24582220..515cae37a0 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -63,9 +63,9 @@
             <span class='fas fa-file-download'></span> {% trans "Export" %}
         </button>
         {% endif %}
-    </div>
-    <div class='filter-list' id='filter-list-bom'>
-        <!-- Empty div (will be filled out with avilable BOM filters) -->
+        <div class='filter-list' id='filter-list-bom'>
+            <!-- Empty div (will be filled out with avilable BOM filters) -->
+        </div>
     </div>
 </div>
 
@@ -179,8 +179,8 @@
                 secondary: [
                     {
                         field: 'sub_part',
-                        label: 'New Part',
-                        title: 'Create New Part',
+                        label: '{% trans "New Part" %}',
+                        title: '{% trans "Create New Part" %}',
                         url: "{% url 'part-create' %}",
                     },
                 ]
diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index 1ee5e8821b..c36f828271 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -49,14 +49,14 @@
             {% for row in bom_rows %}
             <tr {% if row.errors %} style='background: #ffeaea;'{% endif %} part-name='{{ row.part_name }}' part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
                 <td>
-                    <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
+                    <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='{% trans "Remove row" %}'>
                             <span row_id='{{ forloop.counter }}' class='fas fa-trash-alt icon-red'></span>
                     </button>
                 </td>
                 <td></td>
                 <td>{% add row.index 1 %}</td>
                 <td>
-                    <button class='btn btn-default btn-create'  onClick='newPartFromBomWizard()' id='new_part_row_{{ row.index }}' title='Create new part' type='button'>
+                    <button class='btn btn-default btn-create'  onClick='newPartFromBomWizard()' id='new_part_row_{{ row.index }}' title='{% trans "Create new part" %}' type='button'>
                         <span row_id='{{ row.index }}' class='fas fa-plus icon-green'/>
                     </button>
                     <select class='select bomselect' id='select_part_{{ row.index }}' name='part_{{ row.index }}'>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 47ef866e2e..4dcd599d22 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -126,9 +126,9 @@
                 <li><a href='#' id='multi-part-export' title='{% trans "Export" %}'>{% trans "Export Data" %}</a></li>
             </ul>
         </div>
-    </div>
-    <div class='filter-list' id='filter-list-parts'>
-        <!-- Empty div -->
+        <div class='filter-list' id='filter-list-parts'>
+            <!-- Empty div -->
+        </div>
     </div>
 </div>
 
diff --git a/InvenTree/part/templates/part/copy_part.html b/InvenTree/part/templates/part/copy_part.html
index 3abf0c5d54..bf8070a55f 100644
--- a/InvenTree/part/templates/part/copy_part.html
+++ b/InvenTree/part/templates/part/copy_part.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% extends "modal_form.html" %}
 
 {% block pre_form_content %}
@@ -10,8 +11,8 @@
 </div>
 
 {% if matches %}
-<b>Possible Matching Parts</b>
-<p>The new part may be a duplicate of these existing parts:</p>
+<b>{% trans "Possible Matching Parts" %}</b>
+<p>{% trans "The new part may be a duplicate of these existing parts" %}:</p>
 <ul class='list-group'>
 {% for match in matches %}
 <li class='list-group-item list-group-item-condensed'>
diff --git a/InvenTree/part/templates/part/variant_part.html b/InvenTree/part/templates/part/variant_part.html
index eac8762947..a9d56093f2 100644
--- a/InvenTree/part/templates/part/variant_part.html
+++ b/InvenTree/part/templates/part/variant_part.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 {% extends "modal_form.html" %}
 
 {% block pre_form_content %}
@@ -5,8 +6,8 @@
 {{ block.super }}
 
 <div class='alert alert-info alert-block'>
-    <b>Create new part variant</b><br>
-    Create a new variant of template <i>'{{ part.full_name }}'</i>.
+    <b>{% trans "Create new part variant" %}</b><br>
+    {% trans "Create a new variant of template" %} <i>'{{ part.full_name }}'</i>.
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index 4373de2385..e21c6295e3 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -99,8 +99,6 @@ part_category_urls = [
 part_bom_urls = [
     url(r'^edit/?', views.BomItemEdit.as_view(), name='bom-item-edit'),
     url('^delete/?', views.BomItemDelete.as_view(), name='bom-item-delete'),
-
-    url(r'^.*$', views.BomItemDetail.as_view(), name='bom-item-detail'),
 ]
 
 # URL list for part web interface
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 6367921fbf..8f1c86fdfc 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -2411,15 +2411,6 @@ class CategoryParameterTemplateDelete(AjaxDeleteView):
         return self.object
 
 
-class BomItemDetail(InvenTreeRoleMixin, DetailView):
-    """ Detail view for BomItem """
-    context_object_name = 'item'
-    queryset = BomItem.objects.all()
-    template_name = 'part/bom-detail.html'
-
-    role_required = 'part.view'
-
-
 class BomItemCreate(AjaxCreateView):
     """ Create view for making a new BomItem object """
     model = BomItem
diff --git a/InvenTree/templates/js/bom.js b/InvenTree/templates/js/bom.js
index e1b3b46cc0..50608e4053 100644
--- a/InvenTree/templates/js/bom.js
+++ b/InvenTree/templates/js/bom.js
@@ -214,47 +214,45 @@ function loadBomTable(table, options) {
         },
     });
 
-    if (!options.editable) {
-        cols.push(
-        {
-            field: 'sub_part_detail.stock',
-            title: '{% trans "Available" %}',
-            searchable: false,
-            sortable: true,
-            formatter: function(value, row, index, field) {
+    cols.push(
+    {
+        field: 'sub_part_detail.stock',
+        title: '{% trans "Available" %}',
+        searchable: false,
+        sortable: true,
+        formatter: function(value, row, index, field) {
 
-                var url = `/part/${row.sub_part_detail.pk}/stock/`;
-                var text = value;
+            var url = `/part/${row.sub_part_detail.pk}/stock/`;
+            var text = value;
 
-                if (value == null || value <= 0) {
-                    text = `<span class='label label-warning'>{% trans "No Stock" %}</span>`;
-                }
-
-                return renderLink(text, url);
+            if (value == null || value <= 0) {
+                text = `<span class='label label-warning'>{% trans "No Stock" %}</span>`;
             }
-        });
 
-        /*
+            return renderLink(text, url);
+        }
+    });
 
-        // TODO - Re-introduce the pricing column at a later stage,
-        //        once the pricing has been "fixed"
-        //        O.W. 2020-11-24
+    /*
 
-        cols.push(
-        {
-            field: 'price_range',
-            title: '{% trans "Price" %}',
-            sortable: true,
-            formatter: function(value, row, index, field) {
-                if (value) {
-                    return value;
-                } else {
-                    return "<span class='warning-msg'>{% trans "No pricing available" %}</span>";
-                }
+    // TODO - Re-introduce the pricing column at a later stage,
+    //        once the pricing has been "fixed"
+    //        O.W. 2020-11-24
+
+    cols.push(
+    {
+        field: 'price_range',
+        title: '{% trans "Price" %}',
+        sortable: true,
+        formatter: function(value, row, index, field) {
+            if (value) {
+                return value;
+            } else {
+                return "<span class='warning-msg'>{% trans "No pricing available" %}</span>";
             }
-        });
-        */
-    }
+        }
+    });
+    */
 
     cols.push(
         {