composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-06 09:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N.546: Portal: Edit value in case log was kept after UserRequest update.

Browse Source 
SVN:trunk[4500]
This commit is contained in:
Guillaume Lajarige
2016-12-08 10:18:59 +00:00
parent 1b1e91f0dc
commit c5a00a1bf1
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
datamodels/2.x/itop-portal-base/portal/web/js/portal_form_handler.js
View File

@@ -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');

7
sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
View File

@@ -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