composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: CaseLog fields value was kept in the form after object update instead of being reset.

Browse Source 
SVN:trunk[4664]
This commit is contained in:
Guillaume Lajarige
2017-04-04 10:17:17 +00:00
parent 85dc7c9452
commit 4fccae157b
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -884,6 +884,9 @@ class ObjectFormManager extends FormManager
// Ending transaction with a commit as everything was fine
CMDBSource::Query('COMMIT');
// Resetting caselog fields value, otherwise the value will stay in it after submit.
$this->oForm->ResetCaseLogFields();
if ($bWasModified)
{
$aData['messages']['success'] += array('_main' => array(Dict::S('Brick:Portal:Object:Form:Message:Saved')));

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

@@ -135,16 +135,6 @@ $(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');