composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 11:38:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3712 - Activity panel: Improve history entries to have a different icon depending the origin (interactive, webservices, csv, ...)

Browse Source
This commit is contained in:
Molkobain
2021-08-02 19:39:53 +02:00
parent 39bcd3e4cd
commit 1da1e0b1bd
10 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php
View File

@@ -117,7 +117,7 @@ class ActivityPanelHelper
// - Prepare query to retrieve changes
// N°3924: The "CO.objkey > 0" clause is there to avoid retrieving orphan elements from objects that have not been completely created / cleaned. There seem to be a lot of them due to some cron tasks.
$oSearch = DBObjectSearch::FromOQL('SELECT CO FROM CMDBChangeOp AS CO WHERE CO.objclass = :obj_class AND CO.objkey = :obj_key AND CO.objkey > 0 AND CO.finalclass NOT IN (:excluded_optypes)');
$oSearch = DBObjectSearch::FromOQL('SELECT CO, C FROM CMDBChangeOp AS CO JOIN CMDBChange AS C ON CO.change = C.id WHERE CO.objclass = :obj_class AND CO.objkey = :obj_key AND CO.objkey > 0 AND CO.finalclass NOT IN (:excluded_optypes)');
$aArgs = ['obj_class' => $sObjectClass, 'obj_key' => $sObjectId, 'excluded_optypes' => ['CMDBChangeOpSetAttributeCaseLog']];
// - Optional offset condition
@@ -132,7 +132,7 @@ class ActivityPanelHelper
// Note: We can't order by date (only) as something multiple CMDBChangeOp rows are inserted at the same time (eg. Delivery model of the "Demo" Organization in the sample data).
// As the DB returns rows "chronologically", we get the older first and it messes with the processing. Ordering by the ID is way much simpler and less DB CPU consuming.
$oSet = new DBObjectSet($oSearch, ['id' => false], $aArgs);
$oSet = new DBObjectSet($oSearch, ['CO.id' => false], $aArgs);
// - Limit history entries to display
if ($bLimitResultsLength) {
@@ -149,7 +149,10 @@ class ActivityPanelHelper
$oPreviousEditsEntry = null;
/** @var \CMDBChangeOp $oChangeOp */
while ($oChangeOp = $oSet->Fetch()) {
while ($aElements = $oSet->FetchAssoc()) {
$oChange = $aElements['C'] ?? null;
$oChangeOp = $aElements['CO'];
// Skip case log changes as they are handled directly from the attributes themselves (most of them should have been excluded by the OQL above, but some derivated classes could still be retrieved)
if ($oChangeOp instanceof CMDBChangeOpSetAttributeCaseLog) {
continue;
@@ -158,7 +161,7 @@ class ActivityPanelHelper
// Make entry from CMDBChangeOp
$iChangeId = $oChangeOp->Get('change');
try {
$oEntry = ActivityEntryFactory::MakeFromCmdbChangeOp($oChangeOp);
$oEntry = ActivityEntryFactory::MakeFromCmdbChangeOp($oChangeOp, $oChange);
}
catch (Exception $oException) {
IssueLog::Debug(static::class.': Could not create entry from CMDBChangeOp #'.$oChangeOp->GetKey().' related to '.$oChangeOp->Get('objclass').'::'.$oChangeOp->Get('objkey').': '.$oException->getMessage());