From 9bd71c1184b7e58bceaef2f783de93b528762fd1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 1 Jul 2021 17:01:30 +1000 Subject: [PATCH] Refactor deletion of multiple manufacturer part objects - issues multiple DELETE requests via the API --- .../company/detail_manufacturer_part.html | 25 ++++----- InvenTree/company/test_views.py | 32 +---------- InvenTree/part/templates/part/bom.html | 4 +- .../part/templates/part/manufacturer.html | 17 ++---- InvenTree/templates/js/company.js | 55 +++++++++++++++++++ InvenTree/templates/js/stock.js | 2 +- 6 files changed, 74 insertions(+), 61 deletions(-) diff --git a/InvenTree/company/templates/company/detail_manufacturer_part.html b/InvenTree/company/templates/company/detail_manufacturer_part.html index a162334040..992753e97b 100644 --- a/InvenTree/company/templates/company/detail_manufacturer_part.html +++ b/InvenTree/company/templates/company/detail_manufacturer_part.html @@ -25,7 +25,7 @@ {% endif %}
-
    @@ -59,7 +59,9 @@ data: { manufacturer: {{ company.id }}, }, - reload: true, + success: function() { + $("#part-table").bootstrapTable("refresh"); + }, secondary: [ { field: 'part', @@ -88,22 +90,15 @@ } ); + linkButtonsToSelection($("#manufacturer-table"), ['#table-options']); + $("#multi-part-delete").click(function() { var selections = $("#part-table").bootstrapTable("getSelections"); - var parts = []; - - selections.forEach(function(item) { - parts.push(item.pk); - }); - - var url = "{% url 'manufacturer-part-delete' %}" - - launchModalForm(url, { - data: { - parts: parts, - }, - reload: true, + deleteManufacturerParts(selections, { + onSuccess: function() { + $("#part-table").bootstrapTable("refresh"); + } }); }); diff --git a/InvenTree/company/test_views.py b/InvenTree/company/test_views.py index a2ef75c688..ce6d4778b0 100644 --- a/InvenTree/company/test_views.py +++ b/InvenTree/company/test_views.py @@ -258,34 +258,4 @@ class ManufacturerPartViewTests(CompanyViewTestBase): (response, errors) = self.post(url, data, valid=True) # Check that the ManufacturerPart was created! - self.assertEqual(n + 1, ManufacturerPart.objects.all().count()) - - def test_manufacturer_part_delete(self): - """ - Test the ManufacturerPartDelete view - """ - - url = reverse('manufacturer-part-delete') - - # Get form using 'part' argument - response = self.client.get(url, {'part': '2'}, HTTP_X_REQUESTED_WITH='XMLHttpRequest') - self.assertEqual(response.status_code, 200) - - # POST to delete manufacturer part - n = ManufacturerPart.objects.count() - m = SupplierPart.objects.count() - - response = self.client.post( - url, - { - 'manufacturer-part-2': 'manufacturer-part-2', - 'confirm_delete': True - }, - HTTP_X_REQUESTED_WITH='XMLHttpRequest') - - self.assertEqual(response.status_code, 200) - - # Check that the ManufacturerPart was deleted - self.assertEqual(n - 1, ManufacturerPart.objects.count()) - # Check that the SupplierParts were deleted - self.assertEqual(m - 2, SupplierPart.objects.count()) + self.assertEqual(n + 1, ManufacturerPart.objects.all().count()) \ No newline at end of file diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html index dc345f9737..07da7af926 100644 --- a/InvenTree/part/templates/part/bom.html +++ b/InvenTree/part/templates/part/bom.html @@ -123,8 +123,8 @@ }); // Wait for *all* the requests to complete - $.when.apply($, requests).then(function() { - $('#bom-table').bootstrapTable('refresh'); + $.when(requests).then(function() { + location.reload(); }); } } diff --git a/InvenTree/part/templates/part/manufacturer.html b/InvenTree/part/templates/part/manufacturer.html index dc04efc503..ba708d70e8 100644 --- a/InvenTree/part/templates/part/manufacturer.html +++ b/InvenTree/part/templates/part/manufacturer.html @@ -60,17 +60,10 @@ var selections = $("#manufacturer-table").bootstrapTable("getSelections"); - var parts = []; - - selections.forEach(function(item) { - parts.push(item.pk); - }); - - launchModalForm("{% url 'manufacturer-part-delete' %}", { - data: { - parts: parts, - }, - reload: true, + deleteManufacturerParts(selections, { + onSuccess: function() { + $("#manufacturer-table").bootstrapTable("refresh"); + } }); }); @@ -80,7 +73,7 @@ { params: { part: {{ part.id }}, - part_detail: false, + part_detail: true, manufacturer_detail: true, }, } diff --git a/InvenTree/templates/js/company.js b/InvenTree/templates/js/company.js index dc0f0f4cc6..7c70af866b 100644 --- a/InvenTree/templates/js/company.js +++ b/InvenTree/templates/js/company.js @@ -170,6 +170,61 @@ function loadCompanyTable(table, url, options={}) { } +function deleteManufacturerParts(selections, options={}) { + + if (selections.length == 0) { + return; + } + + var parts = []; + + var text = ` +
    +

    {% trans "The following manufacturer parts will be deleted" %}:

    +
      `; + + selections.forEach(function(item) { + parts.push(item.pk); + + text += ` +
    • +

      ${item.MPN} - ${item.part_detail.full_name}

      +
      • `; + }); + + text += ` +
    +
    `; + + showQuestionDialog( + '{% trans "Delete Manufacturer Parts" %}', + text, + { + accept_text: '{% trans "Delete" %}', + accept: function() { + + // Delete each manufacturer part + var requests = []; + + parts.forEach(function(pk) { + var url = `/api/company/part/manufacturer/${pk}`; + + requests.push(inventreeDelete(url)); + }); + + // Wait for all the requests to complete + $.when(requests).then(function() { + + if (options.onSuccess) { + options.onSuccess(); + } + }) + } + } + ); +} + + function loadManufacturerPartTable(table, url, options) { /* * Load manufacturer part table diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js index b557f0c327..97b9df0c68 100644 --- a/InvenTree/templates/js/stock.js +++ b/InvenTree/templates/js/stock.js @@ -906,7 +906,7 @@ function loadStockTable(table, options) { ); }); - $.when.apply($, requests).then(function() { + $.when(requests).then(function() { $("#stock-table").bootstrapTable('refresh'); }); })