kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Allow non-ASCII characters in file names of uploaded files (closes #2484)

Browse Source
This commit is contained in:
Bernd Bestel 2024-08-19 20:51:47 +02:00
parent 5a2600209f
commit c21090f522
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/76_UNRELEASED_xxxx-xx-xx.md
View File

@ -59,4 +59,4 @@
### API ### API
- xxx - Optimized that uploading files where the file name contains non-ASCII characters is now also possible

3
public/js/extensions.js
View File

@ -205,6 +205,9 @@ function CleanFileName(fileName)
// Multiple spaces seem to be a problem, so simply strip them all // Multiple spaces seem to be a problem, so simply strip them all
fileName = fileName.replace(/\s+/g, ""); fileName = fileName.replace(/\s+/g, "");
// Remove any non-ASCII character
fileName = fileName.replace(/[^\x00-\x7F]/g, "");
return fileName; return fileName;
} }

3
public/viewjs/equipmentform.js
View File

@ -17,8 +17,7 @@
if ($("#instruction-manual")[0].files.length > 0) if ($("#instruction-manual")[0].files.length > 0)
{ {
var someRandomStuff = RandomString(); jsonData.instruction_manual_file_name = RandomString() + CleanFileName($("#instruction-manual")[0].files[0].name);
jsonData.instruction_manual_file_name = someRandomStuff + CleanFileName($("#instruction-manual")[0].files[0].name);
} }
if (Grocy.DeleteInstructionManualOnSave) if (Grocy.DeleteInstructionManualOnSave)

3
public/viewjs/productform.js
View File

@ -95,8 +95,7 @@ $('.save-product-button').on('click', function(e)
if ($("#product-picture")[0].files.length > 0) if ($("#product-picture")[0].files.length > 0)
{ {
var someRandomStuff = Math.random().toString(36).substring(2, 100) + Math.random().toString(36).substring(2, 100); jsonData.picture_file_name = RandomString() + CleanFileName($("#product-picture")[0].files[0].name);
jsonData.picture_file_name = someRandomStuff + CleanFileName($("#product-picture")[0].files[0].name);
} }
const location = $(e.currentTarget).attr('data-location') == 'return' ? '/products?product=' : '/product/'; const location = $(e.currentTarget).attr('data-location') == 'return' ? '/products?product=' : '/product/';

3
public/viewjs/recipeform.js
View File

@ -40,8 +40,7 @@ $('.save-recipe').on('click', function(e)
if ($("#recipe-picture")[0].files.length > 0) if ($("#recipe-picture")[0].files.length > 0)
{ {
var someRandomStuff = Math.random().toString(36).substring(2, 100) + Math.random().toString(36).substring(2, 100); jsonData.picture_file_name = RandomString() + CleanFileName($("#recipe-picture")[0].files[0].name);
jsonData.picture_file_name = someRandomStuff + CleanFileName($("#recipe-picture")[0].files[0].name);
} }
const location = $(e.currentTarget).attr('data-location') == 'return' ? '/recipes?recipe=' : '/recipe/'; const location = $(e.currentTarget).attr('data-location') == 'return' ? '/recipes?recipe=' : '/recipe/';

3
public/viewjs/userform.js
View File

@ -43,8 +43,7 @@ $('#save-user-button').on('click', function(e)
if ($("#user-picture")[0].files.length > 0) if ($("#user-picture")[0].files.length > 0)
{ {
var someRandomStuff = Math.random().toString(36).substring(2, 100) + Math.random().toString(36).substring(2, 100); jsonData.picture_file_name = RandomString() + CleanFileName($("#user-picture")[0].files[0].name);
jsonData.picture_file_name = someRandomStuff + CleanFileName($("#user-picture")[0].files[0].name);
} }
if (Grocy.EditMode === 'create') if (Grocy.EditMode === 'create')