From 3f551f9131a2bbeacacff3fd061d978d2d3e4c4c Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 7 Oct 2020 12:15:58 +0200
Subject: [PATCH] FIX #14848 TIME 0:30 merge custom contact field + sql
---
apps/maarch_entreprise/xml/applicationVersion.xml | 2 +-
migration/20.03/2003.sql | 4 ++--
sql/data_fr.sql | 2 +-
src/app/contentManagement/controllers/MergeController.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/maarch_entreprise/xml/applicationVersion.xml b/apps/maarch_entreprise/xml/applicationVersion.xml
index c138f57a4a5..b01004eddd8 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 e066643b979..9fb16dcb65d 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 c9061148828..b31fa5fb8a2 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 034f9ead45d..303f01cd583 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);
--
GitLab