inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-03 04:00:57 +00:00
Code Activity

Merge branch 'inventree:master' into fr-1421-sso

Browse Source
This commit is contained in:
Matthias Mair
2021-10-04 23:26:07 +02:00
committed by GitHub
parent acbea53a3d dfdbb4f7d1
commit 56221a33bf
11 changed files with 122 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/js/dynamic/inventree.js
View File

@ -116,7 +116,7 @@ function inventreeDocReady() {
success: function(data) {
var transformed = $.map(data.results, function(el) {
return {
label: el.name,
label: el.full_name,
id: el.pk,
thumbnail: el.thumbnail
};

6
InvenTree/templates/js/translated/company.js
View File

@ -361,7 +361,7 @@ function loadCompanyTable(table, url, options={}) {
field: 'parts_supplied',
title: '{% trans "Parts Supplied" %}',
formatter: function(value, row) {
return renderLink(value, `/company/${row.pk}/parts/`);
return renderLink(value, `/company/${row.pk}/?display=supplier-parts`);
}
});
} else if (options.pagetype == 'manufacturers') {
@ -370,7 +370,7 @@ function loadCompanyTable(table, url, options={}) {
field: 'parts_manufactured',
title: '{% trans "Parts Manufactured" %}',
formatter: function(value, row) {
return renderLink(value, `/company/${row.pk}/parts/`);
return renderLink(value, `/company/${row.pk}/?display=manufacturer-parts`);
}
});
}
@ -469,6 +469,7 @@ function loadManufacturerPartTable(table, url, options) {
method: 'get',
original: params,
queryParams: filters,
sidePagination: 'server',
name: 'manufacturerparts',
groupBy: false,
formatNoMatches: function() {
@ -724,6 +725,7 @@ function loadSupplierPartTable(table, url, options) {
url: url,
method: 'get',
original: params,
sidePagination: 'server',
queryParams: filters,
name: 'supplierparts',
groupBy: false,

9
InvenTree/templates/js/translated/tables.js
View File

@ -181,6 +181,15 @@ function convertQueryParameters(params, filters) {
if ('sortable' in params) {
delete params['sortable'];
}
// If "original_search" parameter is provided, add it to the "search"
if ('original_search' in params) {
var search = params['search'] || '';
params['search'] = search + ' ' + params['original_search'];
delete params['original_search'];
}
return params;
}