N°4542 - Restore log default value being set through "default" URL param

This commit is contained in:
Molkobain
2021-12-14 09:30:54 +01:00
parent f58e2ce6c0
commit 18041527c5
3 changed files with 34 additions and 4 deletions

View File

@@ -28,6 +28,8 @@ class RichText extends UIBlock
'js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css',
];
/** @var string|null */
protected $sValue;
/** @var array Configuration parameters for the CKEditor instance used with Richtext block */
protected $aConfig;
@@ -39,9 +41,32 @@ class RichText extends UIBlock
public function __construct(?string $sId = null)
{
parent::__construct($sId);
$this->sValue = null;
$this->aConfig = utils::GetCkeditorPref();
}
/**
* @see static::$sValue
* @return string|null
*/
public function GetValue(): ?string
{
return $this->sValue;
}
/**
* @param string|null $sValue
* @see static::$sValue
*
* @return $this
*/
public function SetValue(?string $sValue)
{
$this->sValue = $sValue;
return $this;
}
/**
* @param array $aConfig
* @see static::$aConfig

View File

@@ -73,9 +73,17 @@ class ActivityPanelFactory
$aCaseLogTabs = $oActivityPanel->GetCaseLogTabs();
foreach($aCaseLogTabs as $sCaseLogAttCode => $aCaseLogData)
{
/** @var \ormCaseLog $oCaseLog */
$oCaseLog = $oObject->Get($sCaseLogAttCode);
// Add new entry block only if the case log is not read only
if (false === $aCaseLogData['is_read_only']) {
$oActivityPanel->SetCaseLogTabEntryForm($sCaseLogAttCode, CaseLogEntryFormFactory::MakeForCaselogTab($oObject, $sCaseLogAttCode, $sMode));
// Prefill input if default value passed for new object
if ($oObject->IsNew() && !$oCaseLog->IsEmpty()) {
$oActivityPanel->GetCaseLogTabEntryForm($sCaseLogAttCode)->GetTextInput()->SetValue($oCaseLog->GetModifiedEntry(\ormCaseLog::ENUM_FORMAT_HTML));
}
}
if ($oObject->IsNew()) {
@@ -99,9 +107,6 @@ class ActivityPanelFactory
$oCaseLogEntriesOriginsSet->OptimizeColumnLoad(['C' => ['origin'], 'CO' => ['lastentry']]);
// Retrieve log entries
/** @var \ormCaseLog $oCaseLog */
$oCaseLog = $oObject->Get($sCaseLogAttCode);
// Debug message to help understand why there could be anomalies on the log entries origins
if ($oCaseLog->GetEntryCount() !== $oCaseLogEntriesOriginsSet->Count()) {
IssueLog::Debug(static::class.": Number of log entries ({$oCaseLog->GetEntryCount()}) don't match number of corresponding CMDBChanges ({$oCaseLogEntriesOriginsSet->Count()}) for object {$sObjClass}::{$sObjId} / attribute {$sCaseLogAttCode}");

View File

@@ -1,4 +1,4 @@
{% extends "base/components/input/layout.html.twig" %}
{% block iboInput %}
<textarea id="{{ oUIBlock.GetId() }}" class="htmlEditor ibo-input-richtext-placeholder" name="{{ oUIBlock.GetName() }}" ></textarea>
<textarea id="{{ oUIBlock.GetId() }}" class="htmlEditor ibo-input-richtext-placeholder" name="{{ oUIBlock.GetName() }}">{{ oUIBlock.GetValue() }}</textarea>
{% endblock %}