YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Repair app install

Browse source
This commit is contained in:
ljf 2021-09-12 23:53:59 +02:00
parent 41a8367f21
commit 6c12feac62
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/helpers/yunohostArguments.js
View file

@ -289,16 +289,23 @@ export function formatYunoHostArguments (args, name = null) {
return { form, fields, validations, errors } return { form, fields, validations, errors }
} }
export function pFileReader (file, output, key) { export function pFileReader (file, output, key, base64 = true) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const fr = new FileReader() const fr = new FileReader()
fr.onerror = reject fr.onerror = reject
fr.onload = () => { fr.onload = () => {
output[key] = fr.result.replace(/data:[^;]*;base64,/, '') output[key] = fr.result
if (base64) {
output[key] = fr.result.replace(/data:[^;]*;base64,/, '')
}
output[key + '[name]'] = file.name output[key + '[name]'] = file.name
resolve() resolve()
} }
fr.readAsDataURL(file) if (base64) {
fr.readAsDataURL(file)
} else {
fr.readAsText(file)
}
}) })
} }
/** /**
@ -328,7 +335,7 @@ export function formatFormDataValue (value) {
* @param {Boolean} [extraParams.removeEmpty=true] - Removes "empty" values from the object. * @param {Boolean} [extraParams.removeEmpty=true] - Removes "empty" values from the object.
* @return {Object} the parsed data to be sent to the server, with extracted values if specified. * @return {Object} the parsed data to be sent to the server, with extracted values if specified.
*/ */
export async function formatFormData ( export function formatFormData (
formData, formData,
{ extract = null, flatten = false, removeEmpty = true, removeNull = false, promise = false } = {} { extract = null, flatten = false, removeEmpty = true, removeNull = false, promise = false } = {}
) { ) {