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

Merge pull request from GHSA-fr2w-mp56-g4xp

Browse Source 
* Enforce file download for attachments table(s)

* Enforce file download for attachment in 'StockItemTestResult' table
This commit is contained in:
Oliver 2022-06-15 18:31:56 +10:00 committed by GitHub
parent 0759c3769e
commit 76aa3a75f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/js/translated/attachment.js
View File

@ -228,7 +228,7 @@ function loadAttachmentTable(url, options) {
var html = `<span class='fas ${icon}'></span> ${filename}`; var html = `<span class='fas ${icon}'></span> ${filename}`;
return renderLink(html, value); return renderLink(html, value, {download: true});
} else if (row.link) { } else if (row.link) {
var html = `<span class='fas fa-link'></span> ${row.link}`; var html = `<span class='fas fa-link'></span> ${row.link}`;
return renderLink(html, row.link); return renderLink(html, row.link);

3
InvenTree/templates/js/translated/stock.js
View File

@ -1358,7 +1358,8 @@ function loadStockTestResultsTable(table, options) {
var html = value; var html = value;
if (row.attachment) { if (row.attachment) {
html += `<a href='${row.attachment}'><span class='fas fa-file-alt float-right'></span></a>`; var text = `<span class='fas fa-file-alt float-right'></span>`;
html += renderLink(text, row.attachment, {download: true});
} }
return html; return html;

9
InvenTree/templates/js/translated/tables.js
View File

@ -184,6 +184,13 @@ function renderLink(text, url, options={}) {
var max_length = options.max_length || -1; var max_length = options.max_length || -1;
var extra = '';
if (options.download) {
var fn = url.split('/').at(-1);
extra += ` download='${fn}'`;
}
// Shorten the displayed length if required // Shorten the displayed length if required
if ((max_length > 0) && (text.length > max_length)) { if ((max_length > 0) && (text.length > max_length)) {
var slice_length = (max_length - 3) / 2; var slice_length = (max_length - 3) / 2;
@ -194,7 +201,7 @@ function renderLink(text, url, options={}) {
text = `${text_start}...${text_end}`; text = `${text_start}...${text_end}`;
} }
return '<a href="' + url + '">' + text + '</a>'; return `<a href='${url}'${extra}>${text}</a>`;
} }