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

Merge branch 'develop' into SessionManagement

Browse Source
This commit is contained in:
Eric Espie
2021-09-07 16:33:10 +02:00
parent 2aaac00015 3c081461b0
commit eef3e9b7ae
75 changed files with 1018 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Controller/AjaxRenderController.php
View File

@@ -62,7 +62,7 @@ class AjaxRenderController
$oSet->SetShowObsoleteData($bShowObsoleteData);
$aResult["draw"] = $iDrawNumber;
$aResult["recordsTotal"] = $oSet->Count();
$aResult["recordsFiltered"] = $oSet->Count();
$aResult["recordsFiltered"] = $aResult["recordsTotal"] ;
$aResult["data"] = [];
while ($aObject = $oSet->FetchAssoc()) {
$aObj = [];
@@ -79,7 +79,7 @@ class AjaxRenderController
}
}
}
if (isset($aObj)) {
if (!empty($aObj)) {
if ($sIdName != "") {
if (isset($aObj[$sIdName])) {
$aObj["id"] = $aObj[$sIdName];

8
sources/Controller/Base/Layout/ActivityPanelController.php
View File

@@ -116,6 +116,14 @@ class ActivityPanelController
'html_rendering' => $sEntryAsHtml,
];
}
// Invoke extensions after the update of the object from the activity form
/** @var \iApplicationUIExtension $oExtensionInstance */
foreach(MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
{
$oExtensionInstance->OnFormSubmit($oObject);
}
$oObject->DBWrite();
// Finalize inline images