From c204c44412b94cfffb5cbd169aa791114251d133 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 27 Dec 2019 11:25:46 +0100
Subject: [PATCH] FEAT #12635 TIME 0:10 return civility id
---
src/app/contact/controllers/ContactController.php | 2 +-
test/unitTests/app/contact/ContactControllerTest.php | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php
index 5aebac7398e..b7782956fa1 100755
--- a/src/app/contact/controllers/ContactController.php
+++ b/src/app/contact/controllers/ContactController.php
@@ -216,7 +216,7 @@ class ContactController
$contact = [
'id' => $rawContact['id'],
- 'civility' => !empty($rawContact['civility']) ? ContactModel::getCivilityLabel(['civilityId' => $rawContact['civility']]) : null,
+ 'civility' => $rawContact['civility'],
'firstname' => $rawContact['firstname'],
'lastname' => $rawContact['lastname'],
'company' => $rawContact['company'],
diff --git a/test/unitTests/app/contact/ContactControllerTest.php b/test/unitTests/app/contact/ContactControllerTest.php
index fdd1ee6ec8f..0396924d5e2 100755
--- a/test/unitTests/app/contact/ContactControllerTest.php
+++ b/test/unitTests/app/contact/ContactControllerTest.php
@@ -22,7 +22,7 @@ class ContactControllerTest extends TestCase
$request = \Slim\Http\Request::createFromEnvironment($environment);
$args = [
- 'civility' => 'Sir',
+ 'civility' => 'title1',
'firstname' => 'Hal',
'lastname' => 'Jordan',
'company' => 'Green Lantern Corps',
@@ -82,7 +82,7 @@ class ContactControllerTest extends TestCase
$request = \Slim\Http\Request::createFromEnvironment($environment);
$args = [
- 'civility' => 'Sir',
+ 'civility' => 'title1',
'firstname' => 'Hal',
'department' => 'Sector 2814',
'function' => 'member',
@@ -113,7 +113,7 @@ class ContactControllerTest extends TestCase
$request = \Slim\Http\Request::createFromEnvironment($environment);
$args = [
- 'civility' => 'Sir',
+ 'civility' => 'title1',
'lastname' => 'Sinestro',
'company' => 'Yellow Lantern Corps',
'department' => 'Sector 2813',
@@ -168,7 +168,7 @@ class ContactControllerTest extends TestCase
$request = \Slim\Http\Request::createFromEnvironment($environment);
$args = [
- 'civility' => 'Sir',
+ 'civility' => 'title1',
'firstname' => 'Hal',
'department' => 'Sector 2814',
'function' => 'member',
--
GitLab