From 2ea249275a966e49ad4b481cb0db08acab120591 Mon Sep 17 00:00:00 2001
From: Pek5892 <pek5892@gmail.com>
Date: Tue, 19 Mar 2024 15:27:17 +0100
Subject: [PATCH 1/3] Fix minore

---
 update/2_5.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/update/2_5.sql b/update/2_5.sql
index 233997f45..a4b26afc2 100644
--- a/update/2_5.sql
+++ b/update/2_5.sql
@@ -2354,4 +2354,3 @@ ALTER TABLE `zz_files` ADD `id_adapter` INT NOT NULL AFTER `id_record`;
 UPDATE zz_files SET id_adapter=1;
 
 DELETE FROM `zz_settings` WHERE `nome` = 'Iva da applicare su marca da bollo';
-DELETE FROM `zz_settings_lang` WHERE `name` = 'Iva da applicare su marca da bollo';
\ No newline at end of file

From 837bcae1b2cbf9036343d4e1a88512d9e375be32 Mon Sep 17 00:00:00 2001
From: Matteo <matteo.bacca@gmail.com>
Date: Tue, 19 Mar 2024 15:27:22 +0100
Subject: [PATCH 2/3] Blocco campo tipo archiviazione e blocco eliminazione per
 adattatori archiviazione

---
 modules/adattatori_archiviazione/edit.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/adattatori_archiviazione/edit.php b/modules/adattatori_archiviazione/edit.php
index 11ec71821..6579608a4 100644
--- a/modules/adattatori_archiviazione/edit.php
+++ b/modules/adattatori_archiviazione/edit.php
@@ -30,7 +30,7 @@ include_once __DIR__.'/../../core.php';
 		</div>
 
         <div class="col-md-5">
-			{[ "type": "select", "label": "<?php echo tr('Tipo archiviazione'); ?>", "name": "class", "value": "<?=explode('\\', $record["class"])[4]?>", "values": "list=\"LocalAdapter\":\"Archiviazione locale\",\"FTPAdapter\":\"Archiviazione FTP\"", "required": 1 ]}
+			{[ "type": "select", "label": "<?php echo tr('Tipo archiviazione'); ?>", "name": "class", "value": "<?=explode('\\', $record["class"])[4]?>", "values": "list=\"LocalAdapter\":\"Archiviazione locale\",\"FTPAdapter\":\"Archiviazione FTP\"", "required": 1, "disabled": "1" ]}
 		</div>
 
         <div class="col-md-2">
@@ -46,18 +46,29 @@ include_once __DIR__.'/../../core.php';
 
     <!-- PULSANTI -->
     <?php
-    if(!$adapter->is_default && $adapter->can_delete) {
+
+    $rs_files = Models\Upload::where('id_adapter', $record['id'])->get();
+
+    if(sizeof($rs_files)>0) {
         echo '
-    <a class="btn btn-danger ask" data-backto="record-list">
-        <i id ="elimina" class="fa fa-trash"></i> <?php echo tr(\'Elimina\'); ?>
-    </a>';
-    }else{
+    <div class="row">
+        <div class="col-md-12">
+            <div class="alert alert-warning">L\'adattatore non può essere eliminato perchè uno o più file sono collegati.</div>
+        </div>
+    </div>';
+
+    }else if($adapter->is_default && $adapter->can_delete){
         echo '
     <div class="row">
         <div class="col-md-12">
             <div class="alert alert-warning">L\'adattatore non può essere eliminato.</div>
         </div>
     </div>';
+    }else{
+        echo '
+    <a class="btn btn-danger ask" data-backto="record-list">
+        <i id ="elimina" class="fa fa-trash"></i> <?php echo tr(\'Elimina\'); ?>
+    </a>';
     }
     ?>
 

From b6cf28aa7cc5bdcaf138b93d18bb73f5af53779d Mon Sep 17 00:00:00 2001
From: Matteo <matteo.bacca@gmail.com>
Date: Tue, 19 Mar 2024 15:35:03 +0100
Subject: [PATCH 3/3] Fix api login app

---
 src/API/App/v1/Login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/API/App/v1/Login.php b/src/API/App/v1/Login.php
index 0b7eae93b..9de447515 100755
--- a/src/API/App/v1/Login.php
+++ b/src/API/App/v1/Login.php
@@ -58,7 +58,7 @@ class Login extends Resource implements CreateInterface
                     LEFT JOIN `an_tipianagrafiche_lang` ON (`an_tipianagrafiche_lang`.`id_record` = `an_tipianagrafiche`.`id` AND `an_tipianagrafiche_lang`.`id_lang` = '.prepare(\App::getLang()).")
                     INNER JOIN `zz_groups` ON `zz_users`.`idgruppo`=`zz_groups`.`id`
                     LEFT JOIN `zz_groups_lang` ON (`zz_groups_lang`.`id_record` = `zz_groups`.`id` AND `zz_groups_lang`.`id_lang` = ".prepare(\App::getLang()).")
-                WHERE `an_tipianagrafiche_lang`.`name` = 'Tecnico' AND `an_anagrafiche`.`deleted_at` IS NULL AND `id` = :id", [
+                WHERE `an_tipianagrafiche_lang`.`name` = 'Tecnico' AND `an_anagrafiche`.`deleted_at` IS NULL AND `zz_users`.`id` = :id", [
                     ':id' => $user['id'],
                 ]);
             }