diff --git a/src/Controller/BaseController.php b/src/Controller/BaseController.php
index da0f9bac1..6d9148a5a 100644
--- a/src/Controller/BaseController.php
+++ b/src/Controller/BaseController.php
@@ -28,6 +28,8 @@
*/
abstract class BaseController
{
+ const PATH_TO_JS = '/public/js';
+ const PATH_TO_CSS = '/public/css';
/**
* @param $pageData
* @return string
diff --git a/src/Controller/Pages/AdministrationController.php b/src/Controller/Pages/AdministrationController.php
index ecf8a8433..fbe60e2a6 100644
--- a/src/Controller/Pages/AdministrationController.php
+++ b/src/Controller/Pages/AdministrationController.php
@@ -95,8 +95,8 @@ public static function get(&$pageData): string
$pageData['hddSize'] = $diskTotal;
$pageData['httpConnectionsCount'] = SystemHelper::getHttpConnectionsCount();
$pageData['processCount'] = SystemHelper::getProcessCount();
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/administration.css';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/administration.js';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/administration.css';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/administration.js';
return Render::getInstance()->get('/desktop/pages/administration.html.twig', $pageData);
}
diff --git a/src/Controller/Pages/ConnectionController.php b/src/Controller/Pages/ConnectionController.php
index d8e031a11..df6e59a42 100644
--- a/src/Controller/Pages/ConnectionController.php
+++ b/src/Controller/Pages/ConnectionController.php
@@ -55,9 +55,9 @@ public static function get(&$pageData): string
if (count($coreUpdate) > 0) {
$pageData['INSTALL_TYPE'] = $coreUpdate[0]->getSource();
}
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/connection.css';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/connection.css';
$pageData[ControllerData::JS_END_POOL][] = '/vendor/node_modules/admin-lte/dist/js/adminlte.min.js';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/connection.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/connection.js';
return Render::getInstance()->get('desktop/pages/connection.html.twig', $pageData);
diff --git a/src/Controller/Pages/DashBoardController.php b/src/Controller/Pages/DashBoardController.php
index 77fae8bb0..79b48c8d9 100644
--- a/src/Controller/Pages/DashBoardController.php
+++ b/src/Controller/Pages/DashBoardController.php
@@ -80,7 +80,7 @@ public static function get(&$pageData): string
if (!empty($currentJeeObject)) {
$currentJeeObjectId = $currentJeeObject->getId();
} else {
- throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> Liste objets et résumés'));
+ throw new CoreException(__('Aucun objet racine trouvé. Pour en créer un, allez dans dashboard -> Liste objets et résumés'));
}
$pageData[ControllerData::JS_VARS]['SEL_OBJECT_ID'] = $currentJeeObjectId;
@@ -98,9 +98,9 @@ public static function get(&$pageData): string
$pageData['dashboardObjectListMenu'] = self::getObjectsListMenu($currentJeeObjectId);
$pageData['dashboardChildrenObjects'] = JeeObjectManager::buildTree($currentJeeObject);
- $pageData[ControllerData::JS_POOL][] = '/public/js/libs/widget.js';
- $pageData[ControllerData::JS_POOL][] = '/public/js/desktop/pages/dashboard.js';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/dashboard_events.js';
+ $pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
+ $pageData[ControllerData::JS_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/dashboard_events.js';
// A remettre une fois mise sous forme de thème
$pageData[ControllerData::JS_POOL][] = '/vendor/node_modules/isotope-layout/dist/isotope.pkgd.min.js';
$pageData[ControllerData::JS_POOL][] = '/assets/3rdparty/jquery.multi-column-select/multi-column-select.js';
diff --git a/src/Controller/Pages/FirstUseController.php b/src/Controller/Pages/FirstUseController.php
index e35238366..7adc69ec1 100644
--- a/src/Controller/Pages/FirstUseController.php
+++ b/src/Controller/Pages/FirstUseController.php
@@ -68,9 +68,9 @@ public static function get(&$pageData): string
'serverDatetime' => Utils::getMicrotime()
];
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/firstUse.css';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/tools/log.js';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/firstUse.js';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/firstUse.css';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/tools/log.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/firstUse.js';
$pageData[ControllerData::AJAX_TOKEN] = AjaxHelper::getToken();
return Render::getInstance()->get('desktop/pages/firstUse.html.twig', $pageData);
diff --git a/src/Controller/Pages/PlanController.php b/src/Controller/Pages/PlanController.php
index f5e08c1dd..c2178e7ea 100644
--- a/src/Controller/Pages/PlanController.php
+++ b/src/Controller/Pages/PlanController.php
@@ -78,8 +78,8 @@ public static function get(&$pageData): string
$pageData[ControllerData::JS_VARS]['planHeader_id'] = $planHeader->getId();
}
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/plan.css';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/plan.js';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/plan.css';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/plan.js';
return Render::getInstance()->get('/desktop/pages/plan.html.twig', $pageData);
}
diff --git a/src/Controller/Pages/ViewController.php b/src/Controller/Pages/ViewController.php
index f926a5552..1c84987bc 100644
--- a/src/Controller/Pages/ViewController.php
+++ b/src/Controller/Pages/ViewController.php
@@ -81,9 +81,9 @@ public static function get(&$pageData): string
$pageData['viewHideList'] = false;
}
$pageData[ControllerData::JS_VARS][AjaxParams::VIEW_ID] = $currentView->getId();
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/libs/widget.js';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view.js';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/libs/widget.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view.js';
return Render::getInstance()->get('/desktop/pages/view.html.twig', $pageData);
}
diff --git a/src/Controller/Pages/ViewEditController.php b/src/Controller/Pages/ViewEditController.php
index 9b802f873..9543843d2 100644
--- a/src/Controller/Pages/ViewEditController.php
+++ b/src/Controller/Pages/ViewEditController.php
@@ -44,8 +44,8 @@ class ViewEditController extends BaseController
public static function get(&$pageData): string
{
$pageData['viewEditViewsList'] = ViewManager::all();
- $pageData[ControllerData::CSS_POOL][] = '/public/css/pages/view.css';
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/pages/view_edit.js';
+ $pageData[ControllerData::CSS_POOL][] = self::PATH_TO_CSS . '/pages/view.css';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/pages/view_edit.js';
return Render::getInstance()->get('/desktop/pages/view_edit.html.twig', $pageData);
}
diff --git a/src/Controller/Params/CommandeController.php b/src/Controller/Params/CommandeController.php
index 7d7b84f44..4e2f50ed2 100644
--- a/src/Controller/Params/CommandeController.php
+++ b/src/Controller/Params/CommandeController.php
@@ -39,10 +39,11 @@ class CommandeController extends BaseController
*
* @return string Content of commandes page
*
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/commandes.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/commandes.js';
return Render::getInstance()->get('/desktop/params/commandes.html.twig', $pageData);
}
diff --git a/src/Controller/Params/EqlogicController.php b/src/Controller/Params/EqlogicController.php
index e086bdabf..24e37d19a 100644
--- a/src/Controller/Params/EqlogicController.php
+++ b/src/Controller/Params/EqlogicController.php
@@ -36,10 +36,11 @@ class EqlogicController extends BaseController
*
* @param array $pageData
* @return string
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/eqlogic.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/eqlogic.js';
return Render::getInstance()->get('/desktop/params/eqlogic.html.twig', $pageData);
}
diff --git a/src/Controller/Params/GeneralController.php b/src/Controller/Params/GeneralController.php
index b8a32aae5..9c6924d7b 100644
--- a/src/Controller/Params/GeneralController.php
+++ b/src/Controller/Params/GeneralController.php
@@ -51,7 +51,7 @@ public static function get(&$pageData): string
$cache = CacheManager::byKey('hour');
$pageData['adminLastKnowDate'] = $cache->getValue();
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/general.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/general.js';
return Render::getInstance()->get('/desktop/params/general.html.twig', $pageData);
}
diff --git a/src/Controller/Params/InteractConfigController.php b/src/Controller/Params/InteractConfigController.php
index fa66a551e..6b1dea71f 100644
--- a/src/Controller/Params/InteractConfigController.php
+++ b/src/Controller/Params/InteractConfigController.php
@@ -39,11 +39,12 @@ class InteractConfigController extends BaseController
*
* @return string Content of interaction config page
*
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/interact_config.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/interact_config.js';
return Render::getInstance()->get('/desktop/params/interact_config.html.twig', $pageData);
}
diff --git a/src/Controller/Params/LinksController.php b/src/Controller/Params/LinksController.php
index 9bb2724ba..3f9359544 100644
--- a/src/Controller/Params/LinksController.php
+++ b/src/Controller/Params/LinksController.php
@@ -39,11 +39,12 @@ class LinksController extends BaseController
*
* @return string Content of links page
*
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/links.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/links.js';
return Render::getInstance()->get('/desktop/params/links.html.twig', $pageData);
}
diff --git a/src/Controller/Params/LogConfigController.php b/src/Controller/Params/LogConfigController.php
index 17772ece5..0dc31bf50 100644
--- a/src/Controller/Params/LogConfigController.php
+++ b/src/Controller/Params/LogConfigController.php
@@ -58,7 +58,7 @@ public static function get(&$pageData): string
$pluginData['plugin'] = $plugin;
$pageData['adminPluginsList'][] = $pluginData;
}
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/log_config.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/log_config.js';
return Render::getInstance()->get('/desktop/params/log_config.html.twig', $pageData);
}
diff --git a/src/Controller/Params/ProfilsController.php b/src/Controller/Params/ProfilsController.php
index 91ae1fd7a..df04169de 100644
--- a/src/Controller/Params/ProfilsController.php
+++ b/src/Controller/Params/ProfilsController.php
@@ -136,7 +136,7 @@ public static function get(&$pageData): string
$pageData['adminCategories'] = NextDomHelper::getConfiguration('eqLogic:category');
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/profils.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/profils.js';
return Render::getInstance()->get('/desktop/params/profils.html.twig', $pageData);
}
diff --git a/src/Controller/Params/ReportConfigController.php b/src/Controller/Params/ReportConfigController.php
index 02befbf42..770d0c40a 100644
--- a/src/Controller/Params/ReportConfigController.php
+++ b/src/Controller/Params/ReportConfigController.php
@@ -39,10 +39,11 @@ class ReportConfigController extends BaseController
*
* @return string Content of report config page
*
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/report_config.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/report_config.js';
return Render::getInstance()->get('/desktop/params/report_config.html.twig', $pageData);
}
diff --git a/src/Controller/Params/SummaryController.php b/src/Controller/Params/SummaryController.php
index 3ddcdddf4..f7c4b6b75 100644
--- a/src/Controller/Params/SummaryController.php
+++ b/src/Controller/Params/SummaryController.php
@@ -38,10 +38,11 @@ class SummaryController extends BaseController
*
* @return string Content of summary page
*
+ * @throws \Exception
*/
public static function get(&$pageData): string
{
- $pageData[ControllerData::JS_END_POOL][] = '/public/js/desktop/params/summary.js';
+ $pageData[ControllerData::JS_END_POOL][] = self::PATH_TO_JS . '/desktop/params/summary.js';
return Render::getInstance()->get('/desktop/params/summary.html.twig', $pageData);
}