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

N°1059 Fix new empty caselog entry on bulk modification.

Browse Source
This commit is contained in:
Molkobain
2018-10-03 17:24:08 +02:00
parent 7fddd6acdc
commit 11308dc76a
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/cmdbabstract.class.inc.php
View File

@@ -1757,6 +1757,27 @@ EOF
$sConfigJS = json_encode($aConfig); $sConfigJS = json_encode($aConfig);
$oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit $oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
$oPage->add_ready_script(
<<<EOF
$('#$iId').bind('update', function(evt){
BlockField('cke_$iId', $('#$iId').attr('disabled'));
//Delayed execution - ckeditor must be properly initialized before setting readonly
var retryCount = 0;
var oMe = $('#$iId');
var delayedSetReadOnly = function () {
if (oMe.data('ckeditorInstance').editable() == undefined && retryCount++ < 10) {
setTimeout(delayedSetReadOnly, retryCount * 100); //Wait a while longer each iteration
}
else
{
oMe.data('ckeditorInstance').setReadOnly(oMe.prop('disabled'));
}
};
setTimeout(delayedSetReadOnly, 50);
});
EOF
);
break; break;
case 'HTML': case 'HTML':
@@ -3689,7 +3710,7 @@ EOF
$currValue = $oObj->Get($sAttCode); $currValue = $oObj->Get($sAttCode);
if ($oAttDef instanceof AttributeCaseLog) if ($oAttDef instanceof AttributeCaseLog)
{ {
$currValue = ' '; // Don't put an empty string, in case the field would be considered as mandatory... $currValue = ''; // Put a single scalar value to force caselog to mock a new entry. For more info see N°1059.
} }
if (is_object($currValue)) continue; // Skip non scalar values... if (is_object($currValue)) continue; // Skip non scalar values...
if(!array_key_exists($currValue, $aValues[$sAttCode])) if(!array_key_exists($currValue, $aValues[$sAttCode]))