diff --git a/sources/renderer/console/consoleformrenderer.class.inc.php b/sources/renderer/console/consoleformrenderer.class.inc.php index 6090b58fc..ae7982e7c 100644 --- a/sources/renderer/console/consoleformrenderer.class.inc.php +++ b/sources/renderer/console/consoleformrenderer.class.inc.php @@ -36,6 +36,7 @@ class ConsoleFormRenderer extends FormRenderer $this->AddSupportedField('HiddenField', 'ConsoleSimpleFieldRenderer'); $this->AddSupportedField('StringField', 'ConsoleSimpleFieldRenderer'); $this->AddSupportedField('SelectField', 'ConsoleSimpleFieldRenderer'); + $this->AddSupportedField('TextAreaField', 'ConsoleSimpleFieldRenderer'); $this->AddSupportedField('SelectObjectField', 'ConsoleSelectObjectFieldRenderer'); $this->AddSupportedField('SubFormField', 'ConsoleSubFormFieldRenderer'); } diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php index 56827678b..9513f0e2b 100644 --- a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php +++ b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php @@ -21,6 +21,9 @@ namespace Combodo\iTop\Renderer\Console\FieldRenderer; use \Dict; use Combodo\iTop\Renderer\FieldRenderer; use Combodo\iTop\Renderer\RenderingOutput; +use \Combodo\iTop\Form\Field\TextAreaField; +use \InlineImage; +use \UserRights; class ConsoleSimpleFieldRenderer extends FieldRenderer { @@ -58,6 +61,37 @@ class ConsoleSimpleFieldRenderer extends FieldRenderer $oOutput->AddHtml(''); break; + case 'Combodo\\iTop\\Form\\Field\\TextAreaField': + $bRichEditor = ($this->oField->GetFormat() === TextAreaField::ENUM_FORMAT_HTML); + + $oOutput->AddHtml(''); + if ($this->oField->GetReadOnly()) + { + $oOutput->AddHtml(''); + } + else + { + $oOutput->AddHtml(''); + // Some additional stuff if we are displaying it with a rich editor + if ($bRichEditor) + { + $sEditorLanguage = strtolower(trim(UserRights::GetUserLanguage())); + $oOutput->AddJs( + <<oField->GetGlobalId()}').addClass('htmlEditor'); + $('#{$this->oField->GetGlobalId()}').ckeditor(function(){}, {language: '$sEditorLanguage', contentsLanguage: '$sEditorLanguage'}); +EOF + ); + if (($this->oField->GetObject() !== null) && ($this->oField->GetTransactionId() !== null)) + { + $oOutput->AddJs(InlineImage::EnableCKEditorImageUpload($this->oField->GetObject(), utils::GetUploadTempId($this->oField->GetTransactionId()))); + } + } + } + $oOutput->AddHtml(''); + $oOutput->AddHtml(''); + break; + case 'Combodo\\iTop\\Form\\Field\\SelectField': $oOutput->AddHtml(''); if ($this->oField->GetReadOnly()) @@ -89,6 +123,7 @@ class ConsoleSimpleFieldRenderer extends FieldRenderer switch ($sFieldClass) { case 'Combodo\\iTop\\Form\\Field\\StringField': + case 'Combodo\\iTop\\Form\\Field\\TextAreaField': $oOutput->AddJs( <<oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){ @@ -104,6 +139,7 @@ class ConsoleSimpleFieldRenderer extends FieldRenderer EOF ); break; + case 'Combodo\\iTop\\Form\\Field\\SelectField': $oOutput->AddJs( <<