From 783048a3a9d772d93b77597cd648670a18c90cbb Mon Sep 17 00:00:00 2001 From: MatteoPistorello Date: Mon, 17 Apr 2023 17:28:17 +0200 Subject: [PATCH] Fix modifica allegati --- actions.php | 5 ++--- assets/src/js/functions/allegati.js | 3 +-- include/modifica_allegato.php | 8 +++----- src/HTMLBuilder/Manager/FileManager.php | 12 ++++++------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/actions.php b/actions.php index 6ef9cab50..b66e2e799 100755 --- a/actions.php +++ b/actions.php @@ -223,11 +223,10 @@ elseif (filter('op') == 'download-zip-allegati') { // Modifica dati di un allegato elseif (filter('op') == 'modifica-allegato') { - $id_allegato = filter('id_allegato'); $id_allegati = explode(';',filter('id_allegati')); - if ($id_allegato) { - $upload = Upload::find($id_allegato); + if (sizeof($id_allegati) == 1) { + $upload = Upload::find($id_allegati[0]); $upload->name = post('nome_allegato'); $upload->category = post('categoria_allegato'); $upload->save(); diff --git a/assets/src/js/functions/allegati.js b/assets/src/js/functions/allegati.js index 134d42d43..25616ab0c 100644 --- a/assets/src/js/functions/allegati.js +++ b/assets/src/js/functions/allegati.js @@ -194,7 +194,7 @@ function ricaricaAllegati(gestione) { * @param id * @param ids */ -function modificaAllegato(button, id, ids) { +function modificaAllegato(button, ids) { const gestione = $(button).closest(".gestione-allegati"); let params = new URLSearchParams({ @@ -203,7 +203,6 @@ function modificaAllegato(button, id, ids) { id_plugin: gestione.data('id_plugin'), id_record: gestione.data('id_record'), id_allegati: ids, - id_allegato: id, }).toString(); openModal(globals.translations.allegati.modifica, globals.rootdir + "/actions.php?" + params); diff --git a/include/modifica_allegato.php b/include/modifica_allegato.php index 01bb89b57..6f6be7215 100644 --- a/include/modifica_allegato.php +++ b/include/modifica_allegato.php @@ -19,20 +19,18 @@ use Models\Upload; -$id_allegati = json_decode(filter('id_allegati')); -$id_allegato = json_decode(filter('id_allegato')); +$id_allegati = (array)json_decode(filter('id_allegati')); // Form di inserimento riga documento echo '
-
'; - if ($id_allegato) { - $allegato = Upload::find($id_allegato); + if (sizeof($id_allegati) == 1) { + $allegato = Upload::find($id_allegati[0]); echo '
{[ "type": "text", "label": "'.tr('Nome').'", "name": "nome_allegato", "value": "'.$allegato->name.'" ]} diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php index 90eeec4d0..ebb134127 100755 --- a/src/HTMLBuilder/Manager/FileManager.php +++ b/src/HTMLBuilder/Manager/FileManager.php @@ -177,7 +177,7 @@ class FileManager implements ManagerInterface if (!$options['readonly']) { $result .= ' - '; if (!$file->isFatturaElettronica() || $options['abilita_genera']) { @@ -214,12 +214,12 @@ class FileManager implements ManagerInterface '; if (!$options['readonly']) { $result .= ' - '; } $result .= ' -
'; @@ -292,10 +292,10 @@ $("#'.$attachment_id.' #upload").click(function(){ }); // Estraggo le righe spuntate -function getSelectData() { +function getSelectFiles() { let data=new Array(); - $(\'.files\').find(\'.check_files:checked\').each(function (){ - data.push($(this).closest(\'tr\').data(\'id\')); + $(".files").find(".check_files:checked").each(function (){ + data.push($(this).closest("tr").data("id")); }); return data;