composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 03:58:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Force the number of Tags in ormTagSet

Browse Source
This commit is contained in:
Eric
2018-12-04 15:53:00 +01:00
parent e4e5f627c4
commit 831b18b4d2
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3359,7 +3359,7 @@ EOF
$oTagSet = $this->Get($sAttCode);
if (is_null($oTagSet))
{
$oTagSet = new ormTagSet(get_class($this), $sAttCode);
$oTagSet = new ormTagSet(get_class($this), $sAttCode, $oAttDef->GetMaxItems());
}
$oTagSet->ApplyDelta($value);
$this->Set($sAttCode, $oTagSet);

2
application/wizardhelper.class.inc.php
View File

@@ -177,7 +177,7 @@ class WizardHelper
else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
{
$value = json_decode($value, true);
$oTagSet = new ormTagSet(get_class($oObj), $sAttCode);
$oTagSet = new ormTagSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
$oTagSet->SetValues($value['orig_value']);
$oTagSet->ApplyDelta($value);
$oObj->Set($sAttCode, $oTagSet);

2
core/dbobject.class.php
View File

@@ -1334,7 +1334,7 @@ abstract class DBObject implements iDisplay
{
if (is_string($toCheck))
{
$oTag = new ormTagSet(get_class($this), $sAttCode);
$oTag = new ormTagSet(get_class($this), $sAttCode, $oAtt->GetMaxItems());
try
{
$oTag->SetValues(explode(' ', $toCheck));

4
core/ormtagset.class.inc.php
View File

@@ -227,7 +227,7 @@ final class ormTagSet extends ormSet
*/
public function GetDelta(ormSet $oOtherTagSet)
{
$oTag = new ormTagSet($this->sClass, $this->sAttCode);
$oTag = new ormTagSet($this->sClass, $this->sAttCode, 0);
// Set the initial value
$aOrigTagCodes = $this->GetValues();
$oTag->SetValues($aOrigTagCodes);
@@ -263,7 +263,7 @@ final class ormTagSet extends ormSet
*/
public function GetDeltaTags(ormTagSet $oOtherTagSet)
{
$oTag = new ormTagSet($this->sClass, $this->sAttCode);
$oTag = new ormTagSet($this->sClass, $this->sAttCode, 0);
// Set the initial value
$aOrigTagCodes = $this->GetValues();
$oTag->SetValues($aOrigTagCodes);

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

@@ -1140,7 +1140,7 @@ class ObjectFormManager extends FormManager
$oTagSet = $this->oObject->Get($sAttCode);
if (is_null($oTagSet))
{
$oTagSet = new ormTagSet(get_class($this->oObject), $sAttCode);
$oTagSet = new ormTagSet(get_class($this->oObject), $sAttCode, $oAttDef->GetMaxItems());
}
$oTagSet->ApplyDelta(json_decode($value, true));
$this->oObject->Set($sAttCode, $oTagSet);