mirror of
https://github.com/inventree/InvenTree.git
synced 2025-07-04 12:40:57 +00:00
Merge remote-tracking branch 'inventree/master' into locate-mixin
# Conflicts: # InvenTree/InvenTree/api_version.py # InvenTree/InvenTree/urls.py
This commit is contained in:
@ -71,9 +71,24 @@ function editSetting(key, options={}) {
|
||||
help_text: response.description,
|
||||
type: response.type,
|
||||
choices: response.choices,
|
||||
value: response.value,
|
||||
}
|
||||
};
|
||||
|
||||
// Foreign key lookup available!
|
||||
if (response.type == 'related field') {
|
||||
|
||||
if (response.model_name && response.api_url) {
|
||||
fields.value.type = 'related field';
|
||||
fields.value.model = response.model_name.split('.').at(-1);
|
||||
fields.value.api_url = response.api_url;
|
||||
} else {
|
||||
// Unknown / unsupported model type, default to 'text' field
|
||||
fields.value.type = 'text';
|
||||
console.warn(`Unsupported model type: '${response.model_name}' for setting '${response.key}'`);
|
||||
}
|
||||
}
|
||||
|
||||
constructChangeForm(fields, {
|
||||
url: url,
|
||||
method: 'PATCH',
|
||||
|
@ -1056,6 +1056,7 @@ function loadBuildOutputTable(build_info, options={}) {
|
||||
'{% url "api-stock-test-result-list" %}',
|
||||
{
|
||||
build: build_info.pk,
|
||||
ordering: '-date',
|
||||
},
|
||||
{
|
||||
success: function(results) {
|
||||
@ -2354,7 +2355,7 @@ function loadBuildTable(table, options) {
|
||||
|
||||
var filterTarget = options.filterTarget || null;
|
||||
|
||||
setupFilterList('build', table, filterTarget);
|
||||
setupFilterList('build', table, filterTarget, {download: true});
|
||||
|
||||
$(table).inventreeTable({
|
||||
method: 'get',
|
||||
|
@ -1394,7 +1394,9 @@ function loadPurchaseOrderTable(table, options) {
|
||||
filters[key] = options.params[key];
|
||||
}
|
||||
|
||||
setupFilterList('purchaseorder', $(table));
|
||||
var target = '#filter-list-purchaseorder';
|
||||
|
||||
setupFilterList('purchaseorder', $(table), target, {download: true});
|
||||
|
||||
$(table).inventreeTable({
|
||||
url: '{% url "api-po-list" %}',
|
||||
@ -2091,7 +2093,9 @@ function loadSalesOrderTable(table, options) {
|
||||
|
||||
options.url = options.url || '{% url "api-so-list" %}';
|
||||
|
||||
setupFilterList('salesorder', $(table));
|
||||
var target = '#filter-list-salesorder';
|
||||
|
||||
setupFilterList('salesorder', $(table), target, {download: true});
|
||||
|
||||
$(table).inventreeTable({
|
||||
url: options.url,
|
||||
|
Reference in New Issue
Block a user