From 2d1776a151721d65d0ae007049d358085b2fcfd5 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 25 May 2022 23:35:53 +1000 Subject: [PATCH] Refactor 'DeleteManufacturerPart' form (#3067) * Refactor 'DeleteManufacturerPart' form - Remove duplicated forms - Update style to match other forms - Block on each deletion before progressing to the next one * PEP fix * Adds deleteSupplierParts function * Refactor all instances of supplier part deletion * Refactor tractor : use convenience function for bootstraptable.getSelections * Add deleter for manufacturerpartparameter. Refactor existing code into a single function * Refactor deletion for stock items * JS linting --- InvenTree/build/templates/build/detail.html | 6 +- InvenTree/build/templates/build/index.html | 3 +- .../company/templates/company/detail.html | 43 ++-- .../templates/company/manufacturer_part.html | 107 +++----- .../company/manufacturer_part_sidebar.html | 4 +- .../order/purchase_order_detail.html | 6 +- .../templates/order/purchase_orders.html | 2 +- .../order/templates/order/sales_orders.html | 2 +- InvenTree/part/templates/part/detail.html | 40 +-- InvenTree/stock/templates/stock/location.html | 2 +- InvenTree/templates/js/translated/api.js | 45 ++++ InvenTree/templates/js/translated/bom.js | 37 +-- InvenTree/templates/js/translated/build.js | 25 +- InvenTree/templates/js/translated/company.js | 238 +++++++++++++----- InvenTree/templates/js/translated/forms.js | 24 +- InvenTree/templates/js/translated/modals.js | 11 + InvenTree/templates/js/translated/part.js | 4 +- InvenTree/templates/js/translated/stock.js | 45 ++-- InvenTree/templates/js/translated/tables.js | 18 ++ 19 files changed, 371 insertions(+), 291 deletions(-) diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index dca3fe359d..3b612bcfed 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -527,11 +527,7 @@ $('#btn-unallocate').on('click', function() { $('#allocate-selected-items').click(function() { - var bom_items = $("#allocation-table-untracked").bootstrapTable("getSelections"); - - if (bom_items.length == 0) { - bom_items = $("#allocation-table-untracked").bootstrapTable('getData'); - } + var bom_items = getTableData('#allocation-table-untracked'); allocateStockToBuild( {{ build.pk }}, diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html index 4dbf2aba7a..a70d5d0d95 100644 --- a/InvenTree/build/templates/build/index.html +++ b/InvenTree/build/templates/build/index.html @@ -185,8 +185,7 @@ loadBuildTable($("#build-table"), { {% if report_enabled %} $('#multi-build-print').click(function() { - var rows = $("#build-table").bootstrapTable('getSelections'); - + var rows = getTableData("#build-table"); var build_ids = []; rows.forEach(function(row) { diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html index 9ae40f0833..a5e2e159fc 100644 --- a/InvenTree/company/templates/company/detail.html +++ b/InvenTree/company/templates/company/detail.html @@ -28,8 +28,8 @@
-
    {% if roles.purchase_order.add %} @@ -75,7 +75,8 @@
    -
      @@ -307,20 +308,18 @@ } ); - linkButtonsToSelection($("#manufacturer-part-table"), ['#manufacturer-table-options']); - $("#multi-manufacturer-part-delete").click(function() { - var selections = $("#manufacturer-part-table").bootstrapTable("getSelections"); + var selections = getTableData('#manufacturer-part-table'); deleteManufacturerParts(selections, { - onSuccess: function() { + success: function() { $("#manufacturer-part-table").bootstrapTable("refresh"); } }); }); $("#multi-manufacturer-part-order").click(function() { - var selections = $("#manufacturer-part-table").bootstrapTable("getSelections"); + var selections = getTableData('#manufacturer-part-table'); var parts = []; @@ -364,34 +363,20 @@ } ); - linkButtonsToSelection($("#supplier-part-table"), ['#supplier-table-options']); - $("#multi-supplier-part-delete").click(function() { - var selections = $("#supplier-part-table").bootstrapTable("getSelections"); - var requests = []; + var selections = getTableData("#supplier-part-table"); - showQuestionDialog( - '{% trans "Delete Supplier Parts?" %}', - '{% trans "All selected supplier parts will be deleted" %}', - { - accept: function() { - selections.forEach(function(part) { - var url = `/api/company/part/${part.pk}/`; - - requests.push(inventreeDelete(url)); - }); - - $.when.apply($, requests).done(function() { - $('#supplier-part-table').bootstrapTable('refresh'); - }); - } + deleteSupplierParts(selections, { + success: function() { + $('#supplier-part-table').bootstrapTable('refresh'); } - ); + }); }); $("#multi-supplier-part-order").click(function() { - var selections = $("#supplier-part-table").bootstrapTable("getSelections"); + + var selections = getTableData('#supplier-part-table'); var parts = []; diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html index d46f99b68f..3bc9948c63 100644 --- a/InvenTree/company/templates/company/manufacturer_part.html +++ b/InvenTree/company/templates/company/manufacturer_part.html @@ -129,7 +129,9 @@ src="{% static 'img/blank_image.png' %}"
      - + @@ -174,11 +176,14 @@ src="{% static 'img/blank_image.png' %}"
      - +
      + {% include "filter_list.html" with id="manufacturer-part-parameters" %}
      @@ -256,67 +261,22 @@ $('#supplier-create').click(function () { $("#supplier-part-delete").click(function() { - var selections = $("#supplier-table").bootstrapTable("getSelections"); + var selections = getTableData('#supplier-table'); - var requests = []; - - showQuestionDialog( - '{% trans "Delete Supplier Parts?" %}', - '{% trans "All selected supplier parts will be deleted" %}', - { - accept: function() { - selections.forEach(function(part) { - var url = `/api/company/part/${part.pk}/`; - - requests.push(inventreeDelete(url)); - }); - - $.when.apply($, requests).done(function() { - reloadSupplierPartTable(); - }); - } - } - ); + deleteSupplierParts(selections, { + success: reloadSupplierPartTable, + }); }); $("#multi-parameter-delete").click(function() { - var selections = $("#parameter-table").bootstrapTable("getSelections"); + var selections = getTableData('#parameter-table'); - var text = ` -
      -

      {% trans "Selected parameters will be deleted" %}:

      -
        `; - - selections.forEach(function(item) { - text += `
      • ${item.name} - ${item.value}
        • `; - }); - - text += ` -
      -
      `; - - showQuestionDialog( - '{% trans "Delete Parameters" %}', - text, - { - accept_text: '{% trans "Delete" %}', - accept: function() { - // Delete each parameter via the API - var requests = []; - - selections.forEach(function(item) { - var url = `/api/company/part/manufacturer/parameter/${item.pk}/`; - - requests.push(inventreeDelete(url)); - }); - - $.when.apply($, requests).done(function() { - $('#parameter-table').bootstrapTable('refresh'); - }); - } + deleteManufacturerPartParameters(selections, { + success: function() { + $('#parameter-table').bootstrapTable('refresh'); } - ); + }); }); loadSupplierPartTable( @@ -326,9 +286,9 @@ loadSupplierPartTable( params: { part: {{ part.part.id }}, manufacturer_part: {{ part.id }}, - part_detail: false, + part_detail: true, supplier_detail: true, - manufacturer_detail: false, + manufacturer_detail: true, }, } ); @@ -343,10 +303,6 @@ loadManufacturerPartParameterTable( } ); -linkButtonsToSelection($("#supplier-table"), ['#supplier-part-options']); - -linkButtonsToSelection($("#parameter-table"), ['#parameter-options']); - $('#order-part, #order-part2').click(function() { inventreeGet( @@ -376,15 +332,26 @@ $('#edit-part').click(function () { $('#delete-part').click(function() { - deleteManufacturerPart({{ part.pk }}, { - onSuccess: function() { - {% if part.manufacturer %} - window.location.href = "{% url 'company-detail' part.manufacturer.id %}"; - {% else%} - window.location.href = "{% url 'index' %}"; - {% endif %} + inventreeGet( + '{% url "api-manufacturer-part-detail" part.pk %}', + {}, + { + success: function(data) { + deleteManufacturerParts( + [data], + { + success: function() { + {% if part.manufacturer %} + window.location.href = "{% url 'company-detail' part.manufacturer.id %}"; + {% else%} + window.location.href = "{% url 'index' %}"; + {% endif %} + } + } + ); + } } - }); + ); }); enableSidebar('manufacturerpart'); diff --git a/InvenTree/company/templates/company/manufacturer_part_sidebar.html b/InvenTree/company/templates/company/manufacturer_part_sidebar.html index 81bbb3fd79..64f8f950b0 100644 --- a/InvenTree/company/templates/company/manufacturer_part_sidebar.html +++ b/InvenTree/company/templates/company/manufacturer_part_sidebar.html @@ -4,7 +4,7 @@ {% trans "Parameters" as text %} {% include "sidebar_item.html" with label='parameters' text=text icon="fa-th-list" %} -{% trans "Attachments" as text %} -{% include "sidebar_item.html" with label='attachments' text=text icon="fa-paperclip" %} {% trans "Supplier Parts" as text %} {% include "sidebar_item.html" with label='supplier-parts' text=text icon="fa-building" %} +{% trans "Attachments" as text %} +{% include "sidebar_item.html" with label='attachments' text=text icon="fa-paperclip" %} diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 4c9bc16ca7..85d93f969a 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -191,11 +191,7 @@ $('#new-po-line').click(function() { {% elif order.status == PurchaseOrderStatus.PLACED %} $('#receive-selected-items').click(function() { - var items = $("#po-line-table").bootstrapTable('getSelections'); - - if (items.length == 0) { - items = $("#po-line-table").bootstrapTable('getData'); - } + var items = getTableData('#po-line-table'); receivePurchaseOrderItems( {{ order.id }}, diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html index f76cc936af..e66863cbb5 100644 --- a/InvenTree/order/templates/order/purchase_orders.html +++ b/InvenTree/order/templates/order/purchase_orders.html @@ -172,7 +172,7 @@ $("#view-list").click(function() { {% if report_enabled %} $("#order-print").click(function() { - var rows = $("#purchase-order-table").bootstrapTable('getSelections'); + var rows = getTableData('#purchase-order-table'); var orders = []; diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html index 81c9f3670d..23580567b9 100644 --- a/InvenTree/order/templates/order/sales_orders.html +++ b/InvenTree/order/templates/order/sales_orders.html @@ -176,7 +176,7 @@ loadSalesOrderTable("#sales-order-table", { {% if report_enabled %} $("#order-print").click(function() { - var rows = $("#sales-order-table").bootstrapTable('getSelections'); + var rows = getTableData('#sales-order-table'); var orders = []; diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 23d8af755a..4f67a9bbc9 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -360,7 +360,9 @@ {% include "filter_list.html" with id="supplier-part" %} @@ -443,27 +445,11 @@ $("#supplier-part-delete").click(function() { - var selections = $("#supplier-part-table").bootstrapTable("getSelections"); + var selections = getTableData('#supplier-part-table'); - var requests = []; - - showQuestionDialog( - '{% trans "Delete Supplier Parts?" %}', - '{% trans "All selected supplier parts will be deleted" %}', - { - accept: function() { - selections.forEach(function(part) { - var url = `/api/company/part/${part.pk}/`; - - requests.push(inventreeDelete(url)); - }); - - $.when.apply($, requests).done(function() { - reloadSupplierPartTable(); - }); - } - } - ); + deleteSupplierParts(selections, { + success: reloadSupplierPartTable, + }); }); loadSupplierPartTable( @@ -472,7 +458,7 @@ { params: { part: {{ part.id }}, - part_detail: false, + part_detail: true, supplier_detail: true, manufacturer_detail: true, }, @@ -497,10 +483,10 @@ $("#manufacturer-part-delete").click(function() { - var selections = $("#manufacturer-part-table").bootstrapTable("getSelections"); + var selectionss = getTableData('#manufacturer-part-table'); deleteManufacturerParts(selections, { - onSuccess: function() { + success: function() { $("#manufacturer-part-table").bootstrapTable("refresh"); } }); @@ -587,11 +573,7 @@ $('#bom-item-delete').click(function() { // Get a list of the selected BOM items - var rows = $("#bom-table").bootstrapTable('getSelections'); - - if (rows.length == 0) { - rows = $('#bom-table').bootstrapTable('getData'); - } + var rows = getTableData('#bom-table'); deleteBomItems(rows, { success: function() { diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html index 496e0b4e1c..b8a3a6cc29 100644 --- a/InvenTree/stock/templates/stock/location.html +++ b/InvenTree/stock/templates/stock/location.html @@ -254,7 +254,7 @@ $('#multi-location-print-label').click(function() { - var selections = $('#sublocation-table').bootstrapTable('getSelections'); + var selections = getTableData('#sublocation-table'); var locations = []; diff --git a/InvenTree/templates/js/translated/api.js b/InvenTree/templates/js/translated/api.js index e260f605cc..eda93984f6 100644 --- a/InvenTree/templates/js/translated/api.js +++ b/InvenTree/templates/js/translated/api.js @@ -7,6 +7,7 @@ /* exported inventreeGet, inventreeDelete, + inventreeMultiDelete, inventreeFormDataUpload, showApiError, */ @@ -171,6 +172,50 @@ function inventreeDelete(url, options={}) { return inventreePut(url, {}, options); } + +/* + * Perform a 'multi delete' operation: + * + * - Items are deleted sequentially from the database, rather than simultaneous requests + * - This prevents potential overload / transaction issues in the DB backend + * + * Notes: + * - Assumes that each item in the 'items' list has a parameter 'pk' + */ +function inventreeMultiDelete(url, items, options={}) { + + if (!url.endsWith('/')) { + url += '/'; + } + + function doNextDelete() { + if (items.length > 0) { + var item = items.shift(); + + inventreeDelete(`${url}${item.pk}/`, { + complete: doNextDelete + }); + } else { + if (options.modal) { + $(options.modal).modal('hide'); + } + + if (options.success) { + options.success(); + } + } + } + + if (options.modal) { + showModalSpinner(options.modal); + } + + // Initiate the process + doNextDelete(); + +} + + /* * Display a notification with error information */ diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js index b15a2613f8..33840b1caa 100644 --- a/InvenTree/templates/js/translated/bom.js +++ b/InvenTree/templates/js/translated/bom.js @@ -693,41 +693,20 @@ function deleteBomItems(items, options={}) { `; constructFormBody({}, { + method: 'DELETE', title: '{% trans "Delete selected BOM items?" %}', fields: {}, preFormContent: html, - submitText: '{% trans "Delete" %}', - submitClass: 'danger', - confirm: true, onSubmit: function(fields, opts) { - // Individually send DELETE requests for each BOM item - // We do *not* send these all at once, to prevent overloading the server - // Show the progress spinner - $(opts.modal).find('#modal-progress-spinner').show(); - - function deleteNextBomItem() { - - if (items.length > 0) { - - var item = items.shift(); - - inventreeDelete(`/api/bom/${item.pk}/`, - { - complete: deleteNextBomItem, - } - ); - } else { - // Destroy this modal once all items are deleted - $(opts.modal).modal('hide'); - - if (options.success) { - options.success(); - } + inventreeMultiDelete( + '{% url "api-bom-list" %}', + items, + { + modal: opts.modal, + success: options.success, } - } - - deleteNextBomItem(); + ); }, }); } diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js index 34e071a461..8c8152becd 100644 --- a/InvenTree/templates/js/translated/build.js +++ b/InvenTree/templates/js/translated/build.js @@ -834,12 +834,7 @@ function loadBuildOutputTable(build_info, options={}) { var subtable = $(`#output-sub-table-${pk}`); if (subtable.exists()) { - var rows = subtable.bootstrapTable('getSelections'); - - // None selected? Use all! - if (rows.length == 0) { - rows = subtable.bootstrapTable('getData'); - } + var rows = getTableData(`#output-sub-table-${pk}`); allocateStockToBuild( build_info.pk, @@ -1291,11 +1286,7 @@ function loadBuildOutputTable(build_info, options={}) { // Complete multiple outputs $('#multi-output-complete').click(function() { - var outputs = $(table).bootstrapTable('getSelections'); - - if (outputs.length == 0) { - outputs = $(table).bootstrapTable('getData'); - } + var outputs = getTableData(table); completeBuildOutputs( build_info.pk, @@ -1314,11 +1305,7 @@ function loadBuildOutputTable(build_info, options={}) { // Delete multiple build outputs $('#multi-output-delete').click(function() { - var outputs = $(table).bootstrapTable('getSelections'); - - if (outputs.length == 0) { - outputs = $(table).bootstrapTable('getData'); - } + var outputs = getTableData(table); deleteBuildOutputs( build_info.pk, @@ -1337,11 +1324,7 @@ function loadBuildOutputTable(build_info, options={}) { // Print stock item labels $('#incomplete-output-print-label').click(function() { - var outputs = $(table).bootstrapTable('getSelections'); - - if (outputs.length == 0) { - outputs = $(table).bootstrapTable('getData'); - } + var outputs = getTableData(table); var stock_id_values = []; diff --git a/InvenTree/templates/js/translated/company.js b/InvenTree/templates/js/translated/company.js index 1ed38e4b7d..e560d6a72f 100644 --- a/InvenTree/templates/js/translated/company.js +++ b/InvenTree/templates/js/translated/company.js @@ -3,12 +3,11 @@ /* globals constructForm, imageHoverIcon, - inventreeDelete, + inventreeMultiDelete, loadTableFilters, makeIconButton, renderLink, setupFilterList, - showQuestionDialog, */ /* exported @@ -16,6 +15,8 @@ createManufacturerPart, createSupplierPart, deleteManufacturerParts, + deleteManufacturerPartParameters, + deleteSupplierParts, editCompany, loadCompanyTable, loadManufacturerPartTable, @@ -101,15 +102,6 @@ function editManufacturerPart(part, options={}) { }); } -function deleteManufacturerPart(part, options={}) { - - constructForm(`/api/company/part/manufacturer/${part}/`, { - method: 'DELETE', - title: '{% trans "Delete Manufacturer Part" %}', - onSuccess: options.onSuccess, - }); -} - function supplierPartFields() { @@ -211,12 +203,76 @@ function editSupplierPart(part, options={}) { } -function deleteSupplierPart(part, options={}) { +/* + * Delete one or more SupplierPart objects from the database. + * - User will be provided with a modal form, showing all the parts to be deleted. + * - Delete operations are performed sequentialy, not simultaneously + */ +function deleteSupplierParts(parts, options={}) { - constructForm(`/api/company/part/${part}/`, { + if (parts.length == 0) { + return; + } + + function renderPart(sup_part) { + var part = sup_part.part_detail; + var thumb = thumbnailImage(part.thumbnail || part.image); + var supplier = '-'; + var MPN = '-'; + + if (sup_part.supplier_detail) { + supplier = sup_part.supplier_detail.name; + } + + if (sup_part.manufacturer_part_detail) { + MPN = sup_part.manufacturer_part_detail.MPN; + } + + return ` + + ${thumb} ${part.full_name} + ${sup_part.SKU} + ${supplier} + ${MPN} + `; + } + + var rows = ''; + + parts.forEach(function(sup_part) { + rows += renderPart(sup_part); + }); + + var html = ` +
      + {% trans "All selected supplier parts will be deleted" %} +
      + + + + + + + + ${rows} +
      {% trans "Part" %}{% trans "SKU" %}{% trans "Supplier" %}{% trans "MPN" %}
      + `; + + constructFormBody({}, { method: 'DELETE', - title: '{% trans "Delete Supplier Part" %}', - onSuccess: options.onSuccess, + title: '{% trans "Delete Supplier Parts" %}', + preFormContent: html, + onSubmit: function(fields, opts) { + + inventreeMultiDelete( + '{% url "api-supplier-part-list" %}', + parts, + { + modal: opts.modal, + success: options.success + } + ); + } }); } @@ -393,58 +449,116 @@ function loadCompanyTable(table, url, options={}) { } +/* Delete one or more ManufacturerPart objects from the database. + * - User will be provided with a modal form, showing all the parts to be deleted. + * - Delete operations are performed sequentialy, not simultaneously + */ function deleteManufacturerParts(selections, options={}) { if (selections.length == 0) { return; } - var parts = []; + function renderPart(man_part, opts={}) { + var part = man_part.part_detail; + var thumb = thumbnailImage(part.thumbnail || part.image); - var text = ` -
      -

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

      -
        `; + return ` + + ${thumb} ${part.full_name} + ${man_part.MPN} + ${man_part.manufacturer_detail.name} + `; + } - selections.forEach(function(item) { - parts.push(item.pk); + var rows = ''; - text += ` -
      • -

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

        -
        • `; + selections.forEach(function(man_part) { + rows += renderPart(man_part); }); - text += ` -
      -
      `; + var html = ` +
      + {% trans "All selected manufacturer parts will be deleted" %} +
      + + + + + + + ${rows} +
      {% trans "Part" %}{% trans "MPN" %}{% trans "Manufacturer" %}
      + `; - showQuestionDialog( - '{% trans "Delete Manufacturer Parts" %}', - text, - { - accept_text: '{% trans "Delete" %}', - accept: function() { + constructFormBody({}, { + method: 'DELETE', + title: '{% trans "Delete Manufacturer Parts" %}', + preFormContent: html, + onSubmit: function(fields, opts) { - // 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.apply($, requests).done(function() { - - if (options.onSuccess) { - options.onSuccess(); - } - }); - } + inventreeMultiDelete( + '{% url "api-manufacturer-part-list" %}', + selections, + { + modal: opts.modal, + success: options.success, + } + ); } - ); + }); +} + + +function deleteManufacturerPartParameters(selections, options={}) { + + if (selections.length == 0) { + return; + } + + function renderParam(param) { + return ` + + ${param.name} + ${param.units} + `; + } + + var rows = ''; + + selections.forEach(function(param) { + rows += renderParam(param); + }); + + var html = ` +
      + {% trans "All selected parameters will be deleted" %} +
      + + + + + + ${rows} +
      {% trans "Name" %}{% trans "Value" %}
      + `; + + constructFormBody({}, { + method: 'DELETE', + title: '{% trans "Delete Parameters" %}', + preFormContent: html, + onSubmit: function(fields, opts) { + inventreeMultiDelete( + '{% url "api-manufacturer-part-parameter-list" %}', + selections, + { + modal: opts.modal, + success: options.success, + } + ); + } + }); + } @@ -473,6 +587,7 @@ function loadManufacturerPartTable(table, url, options) { method: 'get', original: params, queryParams: filters, + uniqueId: 'pk', sidePagination: 'server', name: 'manufacturerparts', groupBy: false, @@ -588,11 +703,12 @@ function loadManufacturerPartTable(table, url, options) { $(table).find('.button-manufacturer-part-delete').click(function() { var pk = $(this).attr('pk'); + var row = $(table).bootstrapTable('getRowByUniqueId', pk); - deleteManufacturerPart( - pk, + deleteManufacturerParts( + [row], { - onSuccess: function() { + success: function() { $(table).bootstrapTable('refresh'); } } @@ -618,7 +734,7 @@ function loadManufacturerPartParameterTable(table, url, options) { filters[key] = params[key]; } - // setupFilterList("manufacturer-part-parameters", $(table)); + setupFilterList('manufacturer-part-parameters', $(table)); $(table).inventreeTable({ url: url, @@ -730,6 +846,7 @@ function loadSupplierPartTable(table, url, options) { method: 'get', original: params, sidePagination: 'server', + uniqueId: 'pk', queryParams: filters, name: 'supplierparts', groupBy: false, @@ -886,11 +1003,12 @@ function loadSupplierPartTable(table, url, options) { $(table).find('.button-supplier-part-delete').click(function() { var pk = $(this).attr('pk'); + var row = $(table).bootstrapTable('getRowByUniqueId', pk); - deleteSupplierPart( - pk, + deleteSupplierParts( + [row], { - onSuccess: function() { + success: function() { $(table).bootstrapTable('refresh'); } } diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js index b4d5fe6cdc..b684e2f387 100644 --- a/InvenTree/templates/js/translated/forms.js +++ b/InvenTree/templates/js/translated/forms.js @@ -247,11 +247,6 @@ function constructChangeForm(fields, options) { */ function constructDeleteForm(fields, options) { - // Force the "confirm" property if not set - if (!('confirm' in options)) { - options.confirm = true; - } - // Request existing data from the API endpoint // This data can be used to render some information on the form $.ajax({ @@ -430,6 +425,21 @@ function constructFormBody(fields, options) { // otherwise *all* fields will be displayed var displayed_fields = options.fields || fields; + // Override default option values if a 'DELETE' form is specified + if (options.method == 'DELETE') { + if (!('confirm' in options)) { + options.confirm = true; + } + + if (!('submitClass' in options)) { + options.submitClass = 'danger'; + } + + if (!('submitText' in options)) { + options.submitText = '{% trans "Delete" %}'; + } + } + // Handle initial data overrides if (options.data) { for (const field in options.data) { @@ -797,7 +807,7 @@ function submitFormData(fields, options) { } // Show the progress spinner - $(options.modal).find('#modal-progress-spinner').show(); + showModalSpinner(options.modal); // Submit data upload_func( @@ -2625,7 +2635,7 @@ function selectImportFields(url, data={}, options={}) { columns.push(getFormFieldValue(`column_${idx}`, {}, opts)); } - $(opts.modal).find('#modal-progress-spinner').show(); + showModalSpinner(opts.modal); inventreePut( opts.url, diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js index b5ea52005b..9f2a6ba5e7 100644 --- a/InvenTree/templates/js/translated/modals.js +++ b/InvenTree/templates/js/translated/modals.js @@ -16,6 +16,7 @@ showModalImage, removeRowFromModalForm, showQuestionDialog, + showModalSpinner, */ /* @@ -1146,3 +1147,13 @@ function showModalImage(image_url) { hideModalImage(); }); } + + +/* Show (or hide) a progress spinner icon in the dialog */ +function showModalSpinner(modal, show=true) { + if (show) { + $(modal).find('#modal-progress-spinner').show(); + } else { + $(modal).find('#modal-progress-spinner').hide(); + } +} diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 91a0cf80cd..dfc143977d 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -1560,7 +1560,7 @@ function loadPartTable(table, url, options={}) { /* Button callbacks for part table buttons */ $('#multi-part-order').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var parts = []; @@ -1594,7 +1594,7 @@ function loadPartTable(table, url, options={}) { }); $('#multi-part-print-label').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var items = []; diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index f0b7b28a73..b31eb704a9 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -11,8 +11,8 @@ global_settings, handleFormErrors, imageHoverIcon, - inventreeDelete, inventreeGet, + inventreeMultiDelete, inventreePut, launchModalForm, linkButtonsToSelection, @@ -1106,25 +1106,15 @@ function adjustStock(action, items, options={}) { // Delete action is handled differently if (action == 'delete') { - var requests = []; - item_pk_values.forEach(function(pk) { - requests.push( - inventreeDelete( - `/api/stock/${pk}/`, - ) - ); - }); - - // Wait for *all* the requests to complete - $.when.apply($, requests).done(function() { - // Destroy the modal window - $(opts.modal).modal('hide'); - - if (options.success) { - options.success(); + inventreeMultiDelete( + '{% url "api-stock-list" %}', + items, + { + modal: opts.modal, + success: options.success, } - }); + ); return; } @@ -1955,7 +1945,7 @@ function loadStockTable(table, options) { ); function stockAdjustment(action) { - var items = $(table).bootstrapTable('getSelections'); + var items = getTableData(table); adjustStock(action, items, { success: function() { @@ -1967,7 +1957,7 @@ function loadStockTable(table, options) { // Automatically link button callbacks $('#multi-item-print-label').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var items = []; @@ -1979,7 +1969,7 @@ function loadStockTable(table, options) { }); $('#multi-item-print-test-report').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var items = []; @@ -1992,7 +1982,7 @@ function loadStockTable(table, options) { if (global_settings.BARCODE_ENABLE) { $('#multi-item-barcode-scan-into-location').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var items = []; @@ -2021,7 +2011,7 @@ function loadStockTable(table, options) { }); $('#multi-item-merge').click(function() { - var items = $(table).bootstrapTable('getSelections'); + var items = getTableData(table); mergeStockItems(items, { success: function(response) { @@ -2036,7 +2026,7 @@ function loadStockTable(table, options) { $('#multi-item-assign').click(function() { - var items = $(table).bootstrapTable('getSelections'); + var items = getTableData(table); assignStockToCustomer(items, { success: function() { @@ -2046,7 +2036,8 @@ function loadStockTable(table, options) { }); $('#multi-item-order').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + + var selections = getTableData(table); var parts = []; @@ -2063,7 +2054,7 @@ function loadStockTable(table, options) { $('#multi-item-set-status').click(function() { // Select and set the STATUS field for selected stock items - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); // Select stock status var modal = '#modal-form'; @@ -2149,7 +2140,7 @@ function loadStockTable(table, options) { }); $('#multi-item-delete').click(function() { - var selections = $(table).bootstrapTable('getSelections'); + var selections = getTableData(table); var stock = []; diff --git a/InvenTree/templates/js/translated/tables.js b/InvenTree/templates/js/translated/tables.js index a20978dd7d..8f25372f55 100644 --- a/InvenTree/templates/js/translated/tables.js +++ b/InvenTree/templates/js/translated/tables.js @@ -8,6 +8,7 @@ /* exported customGroupSorter, downloadTableData, + getTableData, reloadtable, renderLink, reloadTableFilters, @@ -22,6 +23,23 @@ function reloadtable(table) { } +/* + * Return the 'selected' data rows from a bootstrap table. + * If allowEmpty = false, and the returned dataset is empty, + * then instead try to return *all* the data + */ +function getTableData(table, allowEmpty=false) { + + var data = $(table).bootstrapTable('getSelections'); + + if (data.length == 0 && !allowEmpty) { + data = $(table).bootstrapTable('getData'); + } + + return data; +} + + /** * Download data from a table, via the API. * This requires a number of conditions to be met: