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 #1783 from SchrodingersGat/build-table-filtering

Browse Source 
Fix for strange table filtering bug
This commit is contained in:
Oliver 2021-07-09 12:57:03 +10:00 committed by GitHub
commit 558e24c985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/templates/js/filters.js
View File

@ -314,7 +314,7 @@ function setupFilterList(tableKey, table, target) {
// Only add the new filter if it is not empty!
if (tag && tag.length > 0) {
var filters = addTableFilter(tableKey, tag, val);
reloadTable(table, filters);
reloadTableFilters(table, filters);
// Run this function again
setupFilterList(tableKey, table, target);
@ -333,7 +333,7 @@ function setupFilterList(tableKey, table, target) {
element.find(`#${clear}`).click(function() {
var filters = clearTableFilters(tableKey);
reloadTable(table, filters);
reloadTableFilters(table, filters);
setupFilterList(tableKey, table, target);
});
@ -346,7 +346,7 @@ function setupFilterList(tableKey, table, target) {
var filters = removeTableFilter(tableKey, filter);
reloadTable(table, filters);
reloadTableFilters(table, filters);
// Run this function again!
setupFilterList(tableKey, table, target);

97
InvenTree/templates/js/tables.js
View File

@ -68,7 +68,7 @@ function isNumeric(n) {
* Reload a table which has already been made into a bootstrap table.
* New filters can be optionally provided, to change the query params.
*/
function reloadTable(table, filters) {
function reloadTableFilters(table, filters) {
// Simply perform a refresh
if (filters == null) {
@ -94,16 +94,11 @@ function reloadTable(table, filters) {
}
options.queryParams = function(tableParams) {
for (key in params) {
tableParams[key] = params[key];
}
return tableParams;
}
return convertQueryParameters(tableParams, params);
};
table.bootstrapTable('refreshOptions', options);
table.bootstrapTable('refresh');
table.bootstrapTable('refresh', filters);
}
@ -122,6 +117,55 @@ function visibleColumnString(columns) {
}
/*
* Convert bootstrap-table style parameters to "InvenTree" style
*/
function convertQueryParameters(params, filters) {
// Override the way that we ask the server to sort results
// It seems bootstrap-table does not offer a "native" way to do this...
if ('sort' in params) {
var order = params['order'];
var ordering = params['sort'] || null;
if (ordering) {
if (order == 'desc') {
ordering = `-${ordering}`;
}
params['ordering'] = ordering;
}
delete params['sort'];
delete params['order'];
}
for (var key in filters) {
params[key] = filters[key];
}
// Add "order" back in (if it was originally specified by InvenTree)
// Annoyingly, "order" shadows some field names in InvenTree...
if ('order' in filters) {
params['order'] = filters['order'];
}
// Remove searchable[] array (generated by bootstrap-table)
if ('searchable' in params) {
delete params['searchable'];
}
if ('sortable' in params) {
delete params['sortable'];
}
return params;
}
/* Wrapper function for bootstrapTable.
* Sets some useful defaults, and manage persistent settings.
*/
@ -147,39 +191,8 @@ $.fn.inventreeTable = function(options) {
var filters = options.queryParams || options.filters || {};
options.queryParams = function(params) {
// Override the way that we ask the server to sort results
// It seems bootstrap-table does not offer a "native" way to do this...
if ('sort' in params) {
var order = params['order'];
var ordering = params['sort'] || null;
if (ordering) {
if (order == 'desc') {
ordering = `-${ordering}`;
}
params['ordering'] = ordering;
}
delete params['sort'];
delete params['order'];
}
for (var key in filters) {
params[key] = filters[key];
}
// Add "order" back in (if it was originally specified by InvenTree)
// Annoyingly, "order" shadows some field names in InvenTree...
if ('order' in filters) {
params['order'] = filters['order'];
}
return params;
}
return convertQueryParameters(params, filters);
};
options.rememberOrder = true;