Merge pull request #1867 from SchrodingersGat/delete-fix

inventreeDelete was not returning the promise
This commit is contained in:
Oliver 2021-07-27 08:32:04 +10:00 committed by GitHub
commit de2d9b30ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 10 deletions

View File

@ -371,7 +371,7 @@
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
$('#supplier-part-table').bootstrapTable('refresh'); $('#supplier-part-table').bootstrapTable('refresh');
}); });
} }

View File

@ -207,7 +207,7 @@ $("#supplier-part-delete").click(function() {
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
reloadSupplierPartTable(); reloadSupplierPartTable();
}); });
} }
@ -247,7 +247,7 @@ $("#multi-parameter-delete").click(function() {
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
$('#parameter-table').bootstrapTable('refresh'); $('#parameter-table').bootstrapTable('refresh');
}); });
} }

View File

@ -416,7 +416,7 @@
}); });
// Wait for *all* the requests to complete // Wait for *all* the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
location.reload(); location.reload();
}); });
} }
@ -832,7 +832,7 @@
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
reloadSupplierPartTable(); reloadSupplierPartTable();
}); });
} }

View File

@ -147,8 +147,7 @@ function inventreeDelete(url, options={}) {
options.method = 'DELETE'; options.method = 'DELETE';
inventreePut(url, {}, options); return inventreePut(url, {}, options);
} }

View File

@ -349,7 +349,7 @@ function deleteManufacturerParts(selections, options={}) {
}); });
// Wait for all the requests to complete // Wait for all the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
if (options.onSuccess) { if (options.onSuccess) {
options.onSuccess(); options.onSuccess();

View File

@ -287,7 +287,7 @@ function adjustStock(action, items, options={}) {
}); });
// Wait for *all* the requests to complete // Wait for *all* the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
// Destroy the modal window // Destroy the modal window
$(modal).modal('hide'); $(modal).modal('hide');
@ -1265,7 +1265,7 @@ function loadStockTable(table, options) {
); );
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
$("#stock-table").bootstrapTable('refresh'); $("#stock-table").bootstrapTable('refresh');
}); });
}) })