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

Shorten string fix (#5187)

Browse Source 
* Fix for model renderer code

- Handles string shortening without corrupting HTML

* Fix for BOM table
This commit is contained in:
Oliver 2023-07-06 12:37:40 +10:00 committed by GitHub
parent 35defe78c0
commit 2d2a084866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/templates/js/translated/bom.js
View File

@ -1155,7 +1155,7 @@ function loadBomTable(table, options={}) {
var available_stock = availableQuantity(row); var available_stock = availableQuantity(row);
var text = `${available_stock}`; var text = renderLink(`${available_stock}`, url);
if (row.sub_part_detail && row.sub_part_detail.units) { if (row.sub_part_detail && row.sub_part_detail.units) {
text += ` <small>${row.sub_part_detail.units}</small>`; text += ` <small>${row.sub_part_detail.units}</small>`;
@ -1179,8 +1179,6 @@ function loadBomTable(table, options={}) {
} }
} }
text = renderLink(text, url);
if (row.on_order && row.on_order > 0) { if (row.on_order && row.on_order > 0) {
text += makeIconBadge( text += makeIconBadge(
'fa-shopping-cart', 'fa-shopping-cart',

12
InvenTree/templates/js/translated/model_renderers.js
View File

@ -129,15 +129,19 @@ function renderModel(data, options={}) {
} }
} }
let text = `<span>${data.text}</span>`; let text = data.text;
if (showLink && data.url) {
text = renderLink(text, data.url);
}
text = `<span>${text}</span>`;
if (data.textSecondary) { if (data.textSecondary) {
text += ` - <small><em>${data.textSecondary}</em></small>`; text += ` - <small><em>${data.textSecondary}</em></small>`;
} }
if (showLink && data.url) {
text = renderLink(text, data.url);
}
html += text; html += text;