From 1bb2551edb2afff7543c86cdc0566bd9c5fb8521 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 29 Apr 2022 13:51:49 +1000 Subject: [PATCH] Fixes for model rendering code --- .../js/translated/model_renderers.js | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js index 656a3f9f63..b88de5af35 100644 --- a/InvenTree/templates/js/translated/model_renderers.js +++ b/InvenTree/templates/js/translated/model_renderers.js @@ -113,8 +113,6 @@ function renderStockItem(name, data, parameters={}, options={}) { } } - - var html = ` ${part_detail} @@ -146,7 +144,7 @@ function renderStockLocation(name, data, parameters={}, options={}) { html += ` - ${data.description}`; } - html += `{% trans "Location ID" %}: ${data.pk}`; + html += renderId('{% trans "Location ID" %}', data.pk, parameters); return html; } @@ -162,10 +160,9 @@ function renderBuild(name, data, parameters={}, options={}) { var html = select2Thumbnail(image); - html += `${data.reference} - ${data.quantity} x ${data.part_detail.full_name}`; - html += `{% trans "Build ID" %}: ${data.pk}`; + html += `${data.reference} - ${data.quantity} x ${data.part_detail.full_name}`; - html += `

${data.title}

`; + html += renderId('{% trans "Build ID" %}', data.pk, parameters); return html; } @@ -300,12 +297,9 @@ function renderSalesOrderShipment(name, data, parameters={}, options={}) { var so_prefix = global_settings.SALESORDER_REFERENCE_PREFIX; - var html = ` - ${so_prefix}${data.order_detail.reference} - {% trans "Shipment" %} ${data.reference} - - {% trans "Shipment ID" %}: ${data.pk} - - `; + var html = `${so_prefix}${data.order_detail.reference} - {% trans "Shipment" %} ${data.reference}`; + + html += renderId('{% trans "Shipment ID" %}', data.pk, parameters); return html; } @@ -323,7 +317,7 @@ function renderPartCategory(name, data, parameters={}, options={}) { html += ` - ${data.description}`; } - html += `{% trans "Category ID" %}: ${data.pk}`; + html += renderId('{% trans "Category ID" %}', data.pk, parameters); return html; } @@ -366,7 +360,7 @@ function renderManufacturerPart(name, data, parameters={}, options={}) { html += ` ${data.manufacturer_detail.name} - ${data.MPN}`; html += ` - ${data.part_detail.full_name}`; - html += `{% trans "Manufacturer Part ID" %}: ${data.pk}`; + html += renderId('{% trans "Manufacturer Part ID" %}', data.pk, parameters); return html; } @@ -395,9 +389,7 @@ function renderSupplierPart(name, data, parameters={}, options={}) { html += ` ${data.supplier_detail.name} - ${data.SKU}`; html += ` - ${data.part_detail.full_name}`; - html += `{% trans "Supplier Part ID" %}: ${data.pk}`; - + html += renderId('{% trans "Supplier Part ID" %}', data.pk, parameters); return html; - }