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

N°3549 - Activity panel: Fix inline images in caselogs

Browse Source
This commit is contained in:
Molkobain
2021-02-17 12:29:19 +01:00
parent b39b09c33c
commit f297cdb8b2
6 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
View File

@@ -30,6 +30,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock;
use DBObject;
use Exception;
use MetaModel;
use utils;
/**
* Class ActivityPanel
@@ -62,6 +63,8 @@ class ActivityPanel extends UIBlock
* @see \cmdbAbstractObject::ENUM_OBJECT_MODE_XXX
*/
protected $sObjectMode;
/** @var null|string $sTransactionId Only when $sObjectMode is set to \cmdbAbstractObject::ENUM_OBJECT_MODE_VIEW */
protected $sTransactionId;
/** @var array $aCaseLogs Metadata of the case logs (att. code, color, ...), will be use to make the tabs and identify them easily */
protected $aCaseLogs;
/** @var ActivityEntry[] $aEntries */
@@ -94,8 +97,8 @@ class ActivityPanel extends UIBlock
$this->InitializeCaseLogTabs();
$this->InitializeCaseLogTabsEntryForms();
$this->SetObject($oObject);
$this->SetObjectMode(cmdbAbstractObject::DEFAULT_OBJECT_MODE);
$this->SetObject($oObject);
$this->SetEntries($aEntries);
$this->bAreEntriesSorted = false;
$this->ComputedShowMultipleEntriesSubmitConfirmation();
@@ -195,6 +198,24 @@ class ActivityPanel extends UIBlock
return $this->sObjectMode;
}
/**
* @return bool
* @uses static::$sTransactionId
*/
public function HasTransactionId(): bool
{
return (null !== $this->sTransactionId);
}
/**
* @return string|null
* @uses static::$sTransactionId
*/
public function GetTransactionId(): ?string
{
return $this->sTransactionId;
}
/**
* Set all entries at once.
*
@@ -440,6 +461,14 @@ class ActivityPanel extends UIBlock
'authors' => [],
'is_read_only' => $bIsReadOnly,
];
// Transaction ID is generated only when:
// - There is a least 1 *writable* case log
// - And object is in view mode (in edit mode, it will be handled by the general form)
// Otherwise we generate unnecessary transaction IDs that could saturate the system
if ((false === $bIsReadOnly) && (false === $this->HasTransactionId()) && (cmdbAbstractObject::ENUM_OBJECT_MODE_VIEW === $this->sObjectMode)) {
$this->sTransactionId = (cmdbAbstractObject::ENUM_OBJECT_MODE_VIEW === $this->sObjectMode) ? utils::GetNewTransactionId() : null;
}
}
}

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

@@ -62,12 +62,11 @@ class ActivityPanelFactory
$sObjClass = get_class($oObject);
$iObjId = $oObject->GetKey();
if($sMode==cmdbAbstractObject::ENUM_OBJECT_MODE_PRINT){
$oActivityPanel = new ActivityPanelPrint($oObject);
$sMode= cmdbAbstractObject::ENUM_OBJECT_MODE_VIEW;
}
else{
$oActivityPanel = new ActivityPanel($oObject);
if ($sMode == cmdbAbstractObject::ENUM_OBJECT_MODE_PRINT) {
$oActivityPanel = new ActivityPanelPrint($oObject, [], ActivityPanel::BLOCK_CODE);
$sMode = cmdbAbstractObject::ENUM_OBJECT_MODE_VIEW;
} else {
$oActivityPanel = new ActivityPanel($oObject, [], ActivityPanel::BLOCK_CODE);
}
$oActivityPanel->SetObjectMode($sMode);