composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-30 14:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°917: Fix Bulk modify for AttCodeSet

Browse Source
This commit is contained in:
Eric
2018-09-26 15:46:11 +02:00
parent 720d334053
commit 01551942b3
7 changed files with 201 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2057,11 +2057,11 @@ EOF
$oPage->add_dict_entry('Core:AttributeTagSet:placeholder');
/** @var \ormSet $value */
if (isset($aArgs['this']))
{
$oAttDef->SetTargetClass($aArgs['this']);
}
/** @var \ormSet $value */
$sJson = $oAttDef->GetJsonForWidget($value);
$sInputId = "attr_{$sFormPrefix}{$sAttCode}";
$sHTMLValue = "<div class=\"field_input_zone field_input_tagset\"><input id='$sInputId' name='$sInputId' type='hidden' value='$sJson'></div>{$sValidationSpan}{$sReloadSpan}";
@@ -3975,9 +3975,9 @@ EOF
{
$currValue = ' '; // Don't put an empty string, in case the field would be considered as mandatory...
}
elseif ($currValue instanceof ormTagSet)
elseif ($currValue instanceof ormSet)
{
$currValue = implode(' ', $currValue->GetValue());
$currValue = $oAttDef->GetEditValue($currValue, $oObj);
}
if (is_object($currValue))
{
@@ -4107,12 +4107,8 @@ EOF
{
continue;
}
$aTagCodes = array();
if (!empty($sValues))
{
$aTagCodes = explode(' ', $sValues);
}
$oTagSet->GenerateDiffFromTags($aTagCodes);
$aTagCodes = $oAttDef->FromStringToArray($sValues);
$oTagSet->GenerateDiffFromArray($aTagCodes);
}
$oDummyObj->Set($sAttCode, $oTagSet);
}