diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 2695f875d..d3a35eec4 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -2298,8 +2298,7 @@ EOF ); break; - // TODO 3.0.0: Isn't this part obsolete now that we have the activity panel or should we keep it for devs using it in custom extensions or maybe *transition forms* as a caselog can be MUST_PROMPT? - // used for bulk modify in 3.0 + // In 3.0 not used for activity panel but kept for bulk modify and bulk-event extension case 'CaseLog': $sInputType = self::ENUM_INPUT_TYPE_HTML_EDITOR; $aStyles = array(); @@ -2316,16 +2315,15 @@ EOF $sStyle = 'style="'.implode('; ', $aStyles).'"'; } - $sHeader = '
'; // will be hidden in CSS (via :empty) if it remains empty + $sHeader = '
'; // will be hidden in CSS (via :empty) if it remains empty $sEditValue = is_object($value) ? $value->GetModifiedEntry('html') : ''; - $sPreviousLog = is_object($value) ? $value->GetAsHTML($oPage, true /* bEditMode */, - array('AttributeText', 'RenderWikiHtml')) : ''; + $sPreviousLog = is_object($value) ? $value->GetAsHTML($oPage, true /* bEditMode */, array('AttributeText', 'RenderWikiHtml')) : ''; $iEntriesCount = is_object($value) ? count($value->GetIndex()) : 0; $sHidden = ""; // To know how many entries the case log already contains - $sHTMLValue = "
$sHeader$sPreviousLog
{$sValidationSpan}{$sReloadSpan}$sHidden"; + $sHTMLValue = "$sHeader
"; + $sHTMLValue .= ""; + $sHTMLValue .= "$sPreviousLog
{$sValidationSpan}{$sReloadSpan}$sHidden"; // Note: This should be refactored for all types of attribute (see at the end of this function) but as we are doing this for a maintenance release, we are scheduling it for the next main release in to order to avoid regressions as much as possible. $sNullValue = $oAttDef->GetNullValue();