From 6f57107b25f7e105d8e44978deebf52c52210672 Mon Sep 17 00:00:00 2001 From: Pawel Boguslawski Date: Wed, 23 Jun 2021 12:30:11 +0200 Subject: [PATCH 1/2] Notifications template initialization fix New notifications ID 15 and ID 16 were introduced with e-mail template set to Default which is inconsistent with other e-mail notification templates in system. This mod fixes it (both notifications will initialize template same way as other notifications). Author-Change-Id: IB#1109073 --- CHANGES.md | 3 +++ scripts/database/initial_insert.mysql.sql | 12 ------------ scripts/database/initial_insert.oracle.sql | 12 ------------ scripts/database/initial_insert.postgresql.sql | 12 ------------ scripts/database/initial_insert.xml | 10 ---------- 5 files changed, 3 insertions(+), 46 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e84cd1797d8..fecf4a1109d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,6 @@ +# 6.5.2 ????-??-?? + - 2023-04-25 Ticket email delivery failure notification template initialization fix. + # 6.5.1 2023-03-09 - 2023-02-28 Added options tickets-created-before-date and tickets-created-before-days to console command Admin::Article::StorageSwitch. - 2023-02-28 Fixed encoding of postmaster filter name in AdminPostMasterFilter. diff --git a/scripts/database/initial_insert.mysql.sql b/scripts/database/initial_insert.mysql.sql index 7b138460fce..49f543891f4 100644 --- a/scripts/database/initial_insert.mysql.sql +++ b/scripts/database/initial_insert.mysql.sql @@ -1632,12 +1632,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) # ---------------------------------------------------------- # insert into table notification_event_item # ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (15, 'TransportEmailTemplate', 'Default'); -# ---------------------------------------------------------- -# insert into table notification_event_item -# ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (15, 'Transports', 'Email'); @@ -1680,12 +1674,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) # ---------------------------------------------------------- # insert into table notification_event_item # ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (16, 'TransportEmailTemplate', 'Default'); -# ---------------------------------------------------------- -# insert into table notification_event_item -# ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (16, 'Transports', 'Email'); diff --git a/scripts/database/initial_insert.oracle.sql b/scripts/database/initial_insert.oracle.sql index 00d0c18edd5..a6374dbdd22 100644 --- a/scripts/database/initial_insert.oracle.sql +++ b/scripts/database/initial_insert.oracle.sql @@ -1634,12 +1634,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) -- ---------------------------------------------------------- -- insert into table notification_event_item -- ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (15, 'TransportEmailTemplate', 'Default'); --- ---------------------------------------------------------- --- insert into table notification_event_item --- ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (15, 'Transports', 'Email'); @@ -1682,12 +1676,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) -- ---------------------------------------------------------- -- insert into table notification_event_item -- ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (16, 'TransportEmailTemplate', 'Default'); --- ---------------------------------------------------------- --- insert into table notification_event_item --- ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (16, 'Transports', 'Email'); diff --git a/scripts/database/initial_insert.postgresql.sql b/scripts/database/initial_insert.postgresql.sql index 04b0b983186..a37403260c7 100644 --- a/scripts/database/initial_insert.postgresql.sql +++ b/scripts/database/initial_insert.postgresql.sql @@ -1633,12 +1633,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) -- ---------------------------------------------------------- -- insert into table notification_event_item -- ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (15, 'TransportEmailTemplate', 'Default'); --- ---------------------------------------------------------- --- insert into table notification_event_item --- ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (15, 'Transports', 'Email'); @@ -1681,12 +1675,6 @@ INSERT INTO notification_event_item (notification_id, event_key, event_value) -- ---------------------------------------------------------- -- insert into table notification_event_item -- ---------------------------------------------------------- -INSERT INTO notification_event_item (notification_id, event_key, event_value) - VALUES - (16, 'TransportEmailTemplate', 'Default'); --- ---------------------------------------------------------- --- insert into table notification_event_item --- ---------------------------------------------------------- INSERT INTO notification_event_item (notification_id, event_key, event_value) VALUES (16, 'Transports', 'Email'); diff --git a/scripts/database/initial_insert.xml b/scripts/database/initial_insert.xml index 04d15bb6603..aaaa2d18aca 100644 --- a/scripts/database/initial_insert.xml +++ b/scripts/database/initial_insert.xml @@ -2140,11 +2140,6 @@ Your Znuny Team Recipients AgentOwner - - 15 - TransportEmailTemplate - Default - 15 Transports @@ -2186,11 +2181,6 @@ Your Znuny Team LanguageID en - - 16 - TransportEmailTemplate - Default - 16 Transports From 6e4588cf5b529c4c35ad65cb57457e669a2bef8e Mon Sep 17 00:00:00 2001 From: Pawel Boguslawski Date: Tue, 25 Apr 2023 15:49:54 +0200 Subject: [PATCH 2/2] Changelog removed Author-Change-Id: IB#1109073 --- CHANGES.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fecf4a1109d..e84cd1797d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,3 @@ -# 6.5.2 ????-??-?? - - 2023-04-25 Ticket email delivery failure notification template initialization fix. - # 6.5.1 2023-03-09 - 2023-02-28 Added options tickets-created-before-date and tickets-created-before-days to console command Admin::Article::StorageSwitch. - 2023-02-28 Fixed encoding of postmaster filter name in AdminPostMasterFilter.