Merge remote-tracking branch 'inventree/master' into stock-item-forms

InvenTree/part/templates/part/category.html

@@ -210,7 +210,8 @@
                 {% else %}
                 parent: null,
                 {% endif %}
-            }
+            },
+            allowTreeView: true,
         }
     );
 

InvenTree/part/templates/part/detail.html

@@ -20,13 +20,6 @@
         <!-- Details Table -->
         <table class="table table-striped table-condensed">
             <col width='25'>
-            {% if part.IPN %}
-            <tr>
-                <td><span class='fas fa-tag'></span></td>
-                <td>{% trans "IPN" %}</td>
-                <td>{{ part.IPN }}{% include "clip.html"%}</td>
-            </tr>
-            {% endif %}
             <tr>
                 <td><span class='fas fa-shapes'></span></td>
                 <td>{% trans "Name" %}</td>
@@ -37,6 +30,22 @@
                 <td>{% trans "Description" %}</td>
                 <td>{{ part.description }}{% include "clip.html"%}</td>
             </tr>
+            {% if part.category %}
+            <tr>
+                <td><span class='fas fa-sitemap'></span></td>
+                <td>{% trans "Category" %}</td>
+                <td>
+                    <a href='{% url "category-detail" part.category.pk %}'>{{ part.category }}</a>
+                </td>
+            </tr>
+            {% endif %}
+            {% if part.IPN %}
+            <tr>
+                <td><span class='fas fa-tag'></span></td>
+                <td>{% trans "IPN" %}</td>
+                <td>{{ part.IPN }}{% include "clip.html"%}</td>
+            </tr>
+            {% endif %}
             {% if part.revision %}
             <tr>
                 <td><span class='fas fa-code-branch'></span></td>
@@ -44,6 +53,20 @@
                 <td>{{ part.revision }}{% include "clip.html"%}</td>
             </tr>
             {% endif %}
+            {% if part.units %}
+            <tr>
+                <td></td>
+                <td>{% trans "Units" %}</td>
+                <td>{{ part.units }}</td>
+            </tr>
+            {% endif %}
+            {% if part.minimum_stock %}
+            <tr>
+                <td><span class='fas fa-less-than-equal'></span></td>
+                <td>{% trans "Minimum stock level" %}</td>
+                <td>{{ part.minimum_stock }}</td>
+            </tr>
+            {% endif %}
             {% if part.keywords %}
             <tr>
                 <td><span class='fas fa-key'></span></td>
@@ -79,7 +102,9 @@
             <tr>
                 <td><span class='fas fa-search-location'></span></td>
                 <td>{% trans "Default Location" %}</td>
-                <td>{{ part.default_location }}</td>
+                <td>
+                    <a href='{% url "stock-location-detail" part.default_location.pk %}'>{{ part.default_location }}</a>
+                </td>
             </tr>
             {% endif %}
             {% if part.default_supplier %}

InvenTree/stock/templates/stock/location.html

@@ -191,7 +191,8 @@
             {% else %}
             parent: 'null',
             {% endif %}
-        }
+        },
+        allowTreeView: true,
     });
     
     linkButtonsToSelection(

InvenTree/templates/js/translated/part.js

@@ -1133,8 +1133,10 @@ function loadPartTable(table, url, options={}) {
 }
 
 
+/*
+ * Display a table of part categories
+ */
 function loadPartCategoryTable(table, options) {
-    /* Display a table of part categories */
 
     var params = options.params || {};
 
@@ -1157,15 +1159,15 @@ function loadPartCategoryTable(table, options) {
 
     setupFilterList(filterKey, table, filterListElement);
 
-    var tree_view = inventreeLoad('category-tree-view') == 1;
+    var tree_view = options.allowTreeView && inventreeLoad('category-tree-view') == 1;
 
     table.inventreeTable({
         treeEnable: tree_view,
-        rootParentId: options.params.parent,
+        rootParentId: tree_view ? options.params.parent : null,
         uniqueId: 'pk',
         idField: 'pk',
         treeShowField: 'name',
-        parentIdField: 'parent',
+        parentIdField: tree_view ? 'parent' : null,
         method: 'get',
         url: options.url || '{% url "api-part-category-list" %}',
         queryParams: filters,
@@ -1176,7 +1178,7 @@ function loadPartCategoryTable(table, options) {
         name: 'category',
         original: original,
         showColumns: true,
-        buttons: [
+        buttons: options.allowTreeView ? [
             {
                 icon: 'fas fa-bars',
                 attributes: {
@@ -1215,28 +1217,31 @@ function loadPartCategoryTable(table, options) {
                     );
                 }
             }
-        ],
+        ] : [],
         onPostBody: function() {
 
-            tree_view = inventreeLoad('category-tree-view') == 1;
+            if (options.allowTreeView) {
 
-            if (tree_view) {
+                tree_view = inventreeLoad('category-tree-view') == 1;
 
-                $('#view-category-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                if (tree_view) {
-                $('#view-category-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
 
-                table.treegrid({
+                    $('#view-category-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
-                    treeColumn: 0,
+                    $('#view-category-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
-                    onChange: function() {
-                        table.bootstrapTable('resetView');
-                    },
-                    onExpand: function() {
                     
-                    }
+                    table.treegrid({
-                });
+                        treeColumn: 0,
-            } else {
+                        onChange: function() {
-                $('#view-category-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                            table.bootstrapTable('resetView');
-                $('#view-category-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
+                        },
+                        onExpand: function() {
+                            
+                        }
+                    });
+                } else {
+                    $('#view-category-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                    $('#view-category-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
+                }
             }
         },
         columns: [

InvenTree/templates/js/translated/stock.js

@@ -1669,8 +1669,11 @@ function loadStockTable(table, options) {
     });
 }
 
+
+/* 
+ * Display a table of stock locations
+ */
 function loadStockLocationTable(table, options) {
-    /* Display a table of stock locations */
 
     var params = options.params || {};
 
@@ -1696,15 +1699,15 @@ function loadStockLocationTable(table, options) {
         filters[key] = params[key];
     }
 
-    var tree_view = inventreeLoad('location-tree-view') == 1;
+    var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1;
 
     table.inventreeTable({
         treeEnable: tree_view,
-        rootParentId: options.params.parent,
+        rootParentId: tree_view ? options.params.parent : null,
         uniqueId: 'pk',
         idField: 'pk',
         treeShowField: 'name',
-        parentIdField: 'parent',
+        parentIdField: tree_view ? 'parent' : null,
         disablePagination: tree_view,
         sidePagination: tree_view ? 'client' : 'server',
         serverSort: !tree_view,
@@ -1718,28 +1721,31 @@ function loadStockLocationTable(table, options) {
         showColumns: true,
         onPostBody: function() {
 
-            tree_view = inventreeLoad('location-tree-view') == 1;
+            if (options.allowTreeView) {
 
-            if (tree_view) {
+                tree_view = inventreeLoad('location-tree-view') == 1;
 
-                $('#view-location-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                if (tree_view) {
-                $('#view-location-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
 
-                table.treegrid({
+                    $('#view-location-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
-                    treeColumn: 1,
+                    $('#view-location-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
-                    onChange: function() {
-                        table.bootstrapTable('resetView');
-                    },
-                    onExpand: function() {
                     
-                    }
+                    table.treegrid({
-                });
+                        treeColumn: 1,
-            } else {
+                        onChange: function() {
-                $('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                            table.bootstrapTable('resetView');
-                $('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
+                        },
+                        onExpand: function() {
+                            
+                        }
+                    });
+                } else {
+                    $('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
+                    $('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
+                }
             }
         },
-        buttons: [
+        buttons: options.allowTreeView ? [
             {
                 icon: 'fas fa-bars',
                 attributes: {
@@ -1778,7 +1784,7 @@ function loadStockLocationTable(table, options) {
                     );
                 }
             }
-        ],
+        ] : [],
         columns: [
             {
                 checkbox: true,