From 70c3d61e636cf9d61b11b66bb86a8b31f3fb4c7e Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 26 Mar 2018 14:57:31 +0200
Subject: [PATCH] FEAT #257 Get informations in global
---
rest/index.php | 1 -
src/core/controllers/CoreController.php | 10 ++--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/rest/index.php b/rest/index.php
index b4ca97ca328..2ab3fdbff25 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -109,7 +109,6 @@ $app = new \Slim\App(['settings' => ['displayErrorDetails' => true]]);
//Initialize
$app->get('/initialize', \SrcCore\controllers\CoreController::class . ':initialize');
-$app->get('/headerInformations', \SrcCore\controllers\CoreController::class . ':getHeaderInformations');
//Actions
$app->get('/actions', \Action\controllers\ActionController::class . ':get');
diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php
index 9226c3a582c..be3df2c4c14 100644
--- a/src/core/controllers/CoreController.php
+++ b/src/core/controllers/CoreController.php
@@ -29,6 +29,8 @@ class CoreController
$aInit['coreUrl'] = str_replace('rest/', '', \Url::coreurl());
$aInit['applicationName'] = CoreConfigModel::getApplicationName();
$aInit['lang'] = CoreConfigModel::getLanguage();
+ $aInit['user'] = UserModel::getByUserId(['userId' => $GLOBALS['userId'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
+ $aInit['user']['groups'] = UserModel::getGroupsByUserId(['userId' => $GLOBALS['userId']]);
$aInit['scriptsToinject'] = [];
$scriptsToInject = scandir('dist');
@@ -49,14 +51,6 @@ class CoreController
return $response->withJson($aInit);
}
- public static function getHeaderInformations(Request $request, Response $response)
- {
- $user = UserModel::getByUserId(['userId' => $GLOBALS['userId'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
- $user['groups'] = UserModel::getGroupsByUserId(['userId' => $user['user_id']]);
-
- return $response->withJson($user);
- }
-
public static function getAdministration(Request $request, Response $response)
{
if ($GLOBALS['userId'] == 'superadmin') {
--
GitLab