From c5a00a1bf1ed41c471ed8beafc772a871a152657 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 8 Dec 2016 10:18:59 +0000
Subject: [PATCH] N.546: Portal: Edit value in case log was kept after
 UserRequest update.

SVN:trunk[4500]
---
 .../portal/web/js/portal_form_handler.js               | 10 ++++++++++
 .../fieldrenderer/bssimplefieldrenderer.class.inc.php  |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/web/js/portal_form_handler.js b/datamodels/2.x/itop-portal-base/portal/web/js/portal_form_handler.js
index 91aeaefd7..139c91d01 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/js/portal_form_handler.js
+++ b/datamodels/2.x/itop-portal-base/portal/web/js/portal_form_handler.js
@@ -135,6 +135,16 @@ $(function()
 							// If everything is okay, we close the form and reload it.
 							if(oValidation.valid)
 							{
+								// Resetting textarea fields (delay is necessary has we have to wait for the form to be built.
+								setTimeout(function(){
+									me.options.field_set.find('.portal_form_field_html').each(function(iIndex, oElem){
+										if($(oElem).find('.cke').length > 0)
+										{
+											$(oElem).triggerHandler('set_current_value', '');
+										}
+									});
+								}, 200);
+								
 								if(me.options.is_modal)
 								{
 									me.element.closest('.modal').modal('hide');
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
index 4593d5cea..b89261e43 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
@@ -387,9 +387,14 @@ EOF
 				break;
 			case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
 			case 'Combodo\\iTop\\Form\\Field\\CaseLogField':
+				// Overloading $sFormFieldOptions to include the set_current_value_callback. It would have been nicer to refactor the variable for all field types, but as this is a fix for a maintenance release, we rather be safe.
+				$sValidators = json_encode($aValidators);
 				$oOutput->AddJs(
 					<<<EOF
-					$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").portal_form_field_html($sFormFieldOptions);
+					$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").portal_form_field_html({
+						validators: $sValidators,
+						set_current_value_callback: function(me, oEvent, oData){ $(me.element).find('textarea').val(oData); }
+					});
 EOF
 				);
 				// MagnificPopup on images