composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in AJAX calls introduced by c6b8526d

Browse Source
This commit is contained in:
Molkobain
2021-06-01 09:04:20 +02:00
parent e7c7ca76ac
commit 39efe1237e
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -24,8 +24,8 @@ class DataTable extends UIContentBlock
// Overloaded constants
public const BLOCK_CODE = 'ibo-datatable';
// This block is handled by its own lib (dataTables)
public const INCLUDE_ANCESTORS_DEFAULT_JS_FILES = false;
public const INCLUDE_ANCESTORS_DEFAULT_CSS_FILES = false;
public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = false;
public const REQUIRES_ANCESTORS_DEFAULT_CSS_FILES = false;
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/layout';
public const DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH = 'base/components/datatable/layout';

4
sources/application/UI/Base/Component/Panel/Panel.php
View File

@@ -42,6 +42,10 @@ class Panel extends UIContentBlock
// Overloaded constants
public const BLOCK_CODE = 'ibo-panel';
/** @inheritDoc */
public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = true;
/** @inheritDoc */
public const REQUIRES_ANCESTORS_DEFAULT_CSS_FILES = true;
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/panel/layout';
public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/panel/layout';
public const DEFAULT_JS_FILES_REL_PATH = [

51
sources/application/UI/Base/UIBlock.php
View File

@@ -39,15 +39,15 @@ abstract class UIBlock implements iUIBlock
*/
public const BLOCK_CODE = 'ibo-block';
/**
* @var bool Set to true so the block automatically includes its ancestors' external JS files. If set to false, only the files from the block itself will be included
* @var bool Set to true so the block automatically requires/includes its ancestors' external JS files. If set to false, only the files from the block itself will be included
* @see static::DEFAULT_JS_FILES_REL_PATH
*/
public const INCLUDE_ANCESTORS_DEFAULT_JS_FILES = true;
public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = false;
/**
* @var bool Set to true so the block automatically includes its ancestors' external CSS files. If set to false, only the files from the block itself will be included
* @var bool Set to true so the block automatically requires/includes its ancestors' external CSS files. If set to false, only the files from the block itself will be included
* @see static::DEFAULT_CSS_FILES_REL_PATH
*/
public const INCLUDE_ANCESTORS_DEFAULT_CSS_FILES = true;
public const REQUIRES_ANCESTORS_DEFAULT_CSS_FILES = false;
/** @var string|null */
public const DEFAULT_GLOBAL_TEMPLATE_REL_PATH = null;
@@ -120,20 +120,51 @@ abstract class UIBlock implements iUIBlock
$this->sId = $sId ?? $this->GenerateId();
// Add external JS files
if(static::INCLUDE_ANCESTORS_DEFAULT_JS_FILES){
foreach(array_reverse(class_parents(static::class)) as $sParentClass){
// 1) From ancestors if they are required
if (static::REQUIRES_ANCESTORS_DEFAULT_JS_FILES) {
// Include ancestors files
foreach (array_reverse(class_parents(static::class)) as $sParentClass) {
$this->AddMultipleJsFilesRelPaths($sParentClass::DEFAULT_JS_FILES_REL_PATH);
}
}
$this->AddMultipleJsFilesRelPaths(static::DEFAULT_JS_FILES_REL_PATH);
// 2) For current class if they are explicitely defined/overloaded, otherwise it will require the files from the closest ancestor with the constant definition which we don't want; which means:
// - If this is the root class
// - If this class requires ancestors files in which case it requires itselves
// - If this class overloads files from its parent
// IMPORTANT: We don't have a way -yet- to determine if the instantiated class has overloaded the constant directly
// So we simply check if the instantiated class constant is different from its parent
$mParentClass = get_parent_class(static::class);
if ((false === $mParentClass)
|| (true === static::REQUIRES_ANCESTORS_DEFAULT_JS_FILES)
|| ($mParentClass::DEFAULT_JS_FILES_REL_PATH !== static::DEFAULT_JS_FILES_REL_PATH)
) {
$this->AddMultipleJsFilesRelPaths(static::DEFAULT_JS_FILES_REL_PATH);
}
// Add external CSS files
if(static::INCLUDE_ANCESTORS_DEFAULT_CSS_FILES){
foreach(array_reverse(class_parents(static::class)) as $sParentClass){
// 1) From ancestors if they are required
if (static::REQUIRES_ANCESTORS_DEFAULT_CSS_FILES) {
// Include ancestors files
foreach (array_reverse(class_parents(static::class)) as $sParentClass) {
$this->AddMultipleCssFilesRelPaths($sParentClass::DEFAULT_CSS_FILES_REL_PATH);
}
}
$this->AddMultipleCssFilesRelPaths(static::DEFAULT_CSS_FILES_REL_PATH);
// 2) For current class if they are explicitely defined/overloaded, otherwise it will require the files from the closest ancestor with the constant definition which we don't want; which means:
// - If this is the root class
// - If this class requires ancestors files in which case it requires itselves
// - If this class overloads files from its parent
// IMPORTANT: We don't have a way -yet- to determine if the instantiated class has overloaded the constant directly
// So we simply check if the instantiated class constant is different from its parent
$mParentClass = get_parent_class(static::class);
if ((false === $mParentClass)
|| (true === static::REQUIRES_ANCESTORS_DEFAULT_CSS_FILES)
|| ($mParentClass::DEFAULT_CSS_FILES_REL_PATH !== static::DEFAULT_CSS_FILES_REL_PATH)
) {
$this->AddMultipleCssFilesRelPaths(static::DEFAULT_CSS_FILES_REL_PATH);
}
$this->sHtmlTemplateRelPath = static::DEFAULT_HTML_TEMPLATE_REL_PATH;
$this->aJsTemplatesRelPath[self::ENUM_JS_TYPE_LIVE] = static::DEFAULT_JS_LIVE_TEMPLATE_REL_PATH;