diff --git a/apps/maarch_entreprise/xml/applicationVersion.xml b/apps/maarch_entreprise/xml/applicationVersion.xml index c138f57a4a529fb1927aa6e0d4e869484400b79a..b01004eddd89aad02bdb63b8d4bdc73855fd2365 100755 --- a/apps/maarch_entreprise/xml/applicationVersion.xml +++ b/apps/maarch_entreprise/xml/applicationVersion.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <root> - <version>20.03.11</version> + <version>20.03.12</version> </root> diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql index e066643b979c18387915a252ec0235b96e6576d8..9fb16dcb65d8c49b797ae9be579ae1b7c5983858 100755 --- a/migration/20.03/2003.sql +++ b/migration/20.03/2003.sql @@ -5,7 +5,7 @@ -- -- -- -- -- *************************************************************************-- -UPDATE parameters SET param_value_string = '20.03.11' WHERE id = 'database_version'; +UPDATE parameters SET param_value_string = '20.03.12' WHERE id = 'database_version'; UPDATE parameters SET description = 'Département par défaut sélectionné dans les autocomplétions de la Base Adresse Nationale' WHERE id = 'defaultDepartment'; @@ -16,7 +16,7 @@ DELETE FROM groupbasket_status WHERE system_id IN ( where not exists ( select 1 from actions_groupbaskets agb where gbs.action_id = agb.id_action and gbs.group_id = agb.group_id and gbs.basket_id = agb.basket_id ) -) +); /* VIEWS */ DROP VIEW IF EXISTS res_view_letterbox; diff --git a/sql/data_fr.sql b/sql/data_fr.sql index c9061148828536395facea5c34324e1b84e41107..b31fa5fb8a20675595bee4852401d6246b63792e 100755 --- a/sql/data_fr.sql +++ b/sql/data_fr.sql @@ -1026,7 +1026,7 @@ INSERT INTO parameters (id, param_value_string, param_value_int, param_value_dat INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('folder_id_increment', '', 200, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('work_batch_autoimport_id', NULL, 1, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('postindexing_workbatch', NULL, 1, NULL); -INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '20.03.11', NULL, NULL); +INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '20.03.12', NULL, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL); INSERT INTO parameters (id, description, param_value_string, param_value_int, param_value_date) VALUES ('defaultDepartment', 'Département par défaut sélectionné dans les autocomplétions de la Base Adresse Nationale', NULL, 75, NULL); INSERT INTO parameters (id, description, param_value_string) VALUES ('homepage_message', 'Texte apparaissant dans la bannière sur la page d''accueil, mettre un espace pour supprimer la bannière.', '<p>Découvrez <strong>Maarch Courrier 20.03</strong> avec <a title="notre guide de visite" href="https://docs.maarch.org/gitbook/html/MaarchCourrier/20.03/guu/home.html" target="_blank"><span style="color:#f99830;"><strong>notre guide de visite en ligne</strong></span></a>.</p>'); diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php index 034f9ead45d2cb31004a254dc381815b2d85e573..303f01cd58386039f61a70befe950c64933f08cb 100644 --- a/src/app/contentManagement/controllers/MergeController.php +++ b/src/app/contentManagement/controllers/MergeController.php @@ -317,7 +317,7 @@ class MergeController if ($customFieldsTypes[$customId] == 'banAutocomplete') { $resource['customField_' . $customId] = "{$custom[0]['addressNumber']} {$custom[0]['addressStreet']} {$custom[0]['addressTown']} ({$custom[0]['addressPostcode']})"; } elseif ($customFieldsTypes[$customId] == 'contact') { - $customValues = ContactController::getContactCustomField(['contacts' => $customFieldsValues[$customId]]); + $customValues = ContactController::getContactCustomField(['contacts' => $custom]); $resource['customField_' . $customId] = implode("\n", $customValues); } else { $resource['customField_' . $customId] = implode("\n", $custom);