Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2238 from SchrodingersGat/table-fix

Browse Source 
Table fix
This commit is contained in:
Oliver 2021-11-03 13:57:54 +11:00 committed by GitHub
commit 7d20003137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/part/templates/part/category.html
View File

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

3
InvenTree/stock/templates/stock/location.html
View File

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

17
InvenTree/templates/js/translated/part.js
View File

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

18
InvenTree/templates/js/translated/stock.js
View File

@ -1416,8 +1416,11 @@ function loadStockTable(table, options) {
}); });
} }
/*
* Display a table of stock locations
*/
function loadStockLocationTable(table, options) { function loadStockLocationTable(table, options) {
/* Display a table of stock locations */
var params = options.params || {}; var params = options.params || {};
@ -1443,15 +1446,15 @@ function loadStockLocationTable(table, options) {
filters[key] = params[key]; filters[key] = params[key];
} }
var tree_view = inventreeLoad('location-tree-view') == 1; var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1;
table.inventreeTable({ table.inventreeTable({
treeEnable: tree_view, treeEnable: tree_view,
rootParentId: options.params.parent, rootParentId: tree_view ? options.params.parent : null,
uniqueId: 'pk', uniqueId: 'pk',
idField: 'pk', idField: 'pk',
treeShowField: 'name', treeShowField: 'name',
parentIdField: 'parent', parentIdField: tree_view ? 'parent' : null,
disablePagination: tree_view, disablePagination: tree_view,
sidePagination: tree_view ? 'client' : 'server', sidePagination: tree_view ? 'client' : 'server',
serverSort: !tree_view, serverSort: !tree_view,
@ -1465,6 +1468,8 @@ function loadStockLocationTable(table, options) {
showColumns: true, showColumns: true,
onPostBody: function() { onPostBody: function() {
if (options.allowTreeView) {
tree_view = inventreeLoad('location-tree-view') == 1; tree_view = inventreeLoad('location-tree-view') == 1;
if (tree_view) { if (tree_view) {
@ -1485,8 +1490,9 @@ function loadStockLocationTable(table, options) {
$('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary'); $('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
$('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary'); $('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
} }
}
}, },
buttons: [ buttons: options.allowTreeView ? [
{ {
icon: 'fas fa-bars', icon: 'fas fa-bars',
attributes: { attributes: {
@ -1525,7 +1531,7 @@ function loadStockLocationTable(table, options) {
); );
} }
} }
], ] : [],
columns: [ columns: [
{ {
checkbox: true, checkbox: true,