From 3a8553e72603653f1dc339c5d2ca9b45ed221da6 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 2 Jul 2019 16:20:01 +0200
Subject: [PATCH] FEAT #10828 TIME 0:10 Change check mode
---
src/app/home/controllers/HomeController.php | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/app/home/controllers/HomeController.php b/src/app/home/controllers/HomeController.php
index b3199caa35a..9479f6ae4c3 100755
--- a/src/app/home/controllers/HomeController.php
+++ b/src/app/home/controllers/HomeController.php
@@ -31,7 +31,7 @@ class HomeController
{
$regroupedBaskets = [];
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id', 'external_id']]);
$homeMessage = ParameterModel::getById(['select' => ['param_value_string'], 'id'=> 'homepage_message']);
$homeMessage = trim($homeMessage['param_value_string']);
@@ -86,24 +86,13 @@ class HomeController
$assignedBaskets[$key]['ownerLogin'] = UserModel::getById(['id' => $assignedBasket['owner_user_id'], 'select' => ['user_id']])['user_id'];
}
- $isMaarchParapheurConnected = false;
- $loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/visa/xml/remoteSignatoryBooks.xml']);
- if (!empty($loadedXml)) {
- foreach ($loadedXml->signatoryBook as $value) {
- if ($value->id == "maarchParapheur") {
- if (!empty($value->url) && !empty($value->userId) && !empty($value->password)) {
- $isMaarchParapheurConnected = true;
- }
- break;
- }
- }
- }
+ $externalId = json_decode($user['external_id'], true);
return $response->withJson([
'regroupedBaskets' => $regroupedBaskets,
'assignedBaskets' => $assignedBaskets,
'homeMessage' => $homeMessage,
- 'isMaarchParapheurConnected' => $isMaarchParapheurConnected
+ 'isLinkedToMaarchParapheur' => !empty($externalId['maarchParapheur'])
]);
}
--
GitLab