- {[ "type": "text", "label": "", "name": "name", "value": "$name$", "required": 1 ]}
+ {[ "type": "text", "label": "", "name": "name", "value": "$name$", "required": 1, "extra": "" ]}
@@ -124,7 +133,16 @@ echo '
+
+
+
\ No newline at end of file
diff --git a/modules/stato_email/buttons.php b/modules/stato_email/buttons.php
index acf3964b2..dabf39086 100644
--- a/modules/stato_email/buttons.php
+++ b/modules/stato_email/buttons.php
@@ -17,8 +17,6 @@ if (( $record['attempt'] >= 10) && empty($record['sent_at'])) {
'.tr('Invia immeditamente').'
';
-
-
}else if (!empty($record['sent_at'])) {
echo '
diff --git a/update/2_4_16.sql b/update/2_4_16.sql
index ecfcdea4d..f0e2b092f 100644
--- a/update/2_4_16.sql
+++ b/update/2_4_16.sql
@@ -32,3 +32,10 @@ INSERT INTO `zz_segments` (`id`, `id_module`, `name`, `clause`, `position`, `pat
(NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), 'Tutti', '1=1', 'WHR', '####', '', 1, 0, 0, 0),
(NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), 'Attività ', 'orario_inizio BETWEEN ''|period_start|'' AND ''|period_end|'' OR orario_fine BETWEEN ''|period_start|'' AND ''|period_end|''', 'WHR', '####', '', 0, 0, 0, 0),
(NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), 'Promemoria', '((in_interventi_tecnici.orario_inizio=''0000-00-00 00:00:00'' AND in_interventi_tecnici.orario_fine=''0000-00-00 00:00:00'') OR in_interventi_tecnici.id IS NULL)', 'WHR', '####', '', 0, 0, 0, 0);
+
+
+-- Aggiunta dei template predefiniti che non possono essere rinominati o eliminati
+UPDATE `em_templates` SET `predefined` = '1' WHERE `em_templates`.`name` = 'Notifica intervento';
+UPDATE `em_templates` SET `predefined` = '1' WHERE `em_templates`.`name` = 'Notifica rimozione intervento';
+UPDATE `em_templates` SET `predefined` = '1' WHERE `em_templates`.`name` = 'Reset password';
+UPDATE `em_templates` SET `predefined` = '1' WHERE `em_templates`.`name` = 'Rapportino intervento';
\ No newline at end of file