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

N°931: Integrity controls

Browse Source
This commit is contained in:
Eric
2018-09-11 12:22:50 +02:00
parent 6817cfbeea
commit 8577fc6701
5 changed files with 255 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6040,6 +6040,10 @@ class AttributeTagSet extends AttributeDBFieldVoid
public function IsNull($proposedValue)
{
if (is_null($proposedValue))
{
return true;
}
/** @var \ormTagSet $proposedValue */
return count($proposedValue->GetValue()) == 0;
}

2
core/dbobjectset.class.php
View File

@@ -815,8 +815,8 @@ class DBObjectSet implements iDBObjectSetIterator
if ($resQuery)
{
$aRow = CMDBSource::FetchArray($resQuery);
CMDBSource::FreeResult($resQuery);
$iCount = intval($aRow['COUNT']);
CMDBSource::FreeResult($resQuery);
}
else
{

26
core/tagsetfield.class.inc.php
View File

@@ -102,22 +102,24 @@ abstract class TagSetFieldData extends cmdbAbstractObject
/**
* @param \DeletionPlan $oDeletionPlan
*
* @return bool
* @throws \CoreException
*/
public function DoCheckToDelete(&$oDeletionPlan)
{
parent::DoCheckToDelete($oDeletionPlan);
$sTagCode = $this->Get('tag_code');
$sClass = $this->Get('tag_class');
$sAttCode = $this->Get('tag_attcode');
$oSearch = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sTagCode'");
$oSet = new DBObjectSet($oSearch);
if ($oSet->CountExceeds(1))
if ($oSet->CountExceeds(0))
{
$this->m_aDeleteIssues[] = Dict::S('Core:TagSetFieldData:ErrorDeleteUsedTag');
}
return parent::DoCheckToDelete($oDeletionPlan);
// Clear cache
$sTagDataClass = MetaModel::GetTagDataClass($sClass, $sAttCode);
unset(self::$m_aAllowedValues[$sTagDataClass]);
}
public function DoCheckToWrite()
@@ -127,12 +129,24 @@ abstract class TagSetFieldData extends cmdbAbstractObject
$sTagLabel = $this->Get('tag_label');
$id = $this->GetKey();
$sClassName = get_class($this);
$oSearch = DBSearch::FromOQL("SELECT $sClassName WHERE id != $id AND (tag_code = '$sTagCode' OR tag_label = '$sTagLabel')");
if (empty($id))
{
$oSearch = DBSearch::FromOQL("SELECT $sClassName WHERE (tag_code = '$sTagCode' OR tag_label = '$sTagLabel')");
}
else
{
$oSearch = DBSearch::FromOQL("SELECT $sClassName WHERE id != $id AND (tag_code = '$sTagCode' OR tag_label = '$sTagLabel')");
}
$oSet = new DBObjectSet($oSearch);
if ($oSet->CountExceeds(1))
if ($oSet->CountExceeds(0))
{
$this->m_aCheckIssues[] = Dict::S('Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel');
}
// Clear cache
$sClass = $this->Get('tag_class');
$sAttCode = $this->Get('tag_attcode');
$sTagDataClass = MetaModel::GetTagDataClass($sClass, $sAttCode);
unset(self::$m_aAllowedValues[$sTagDataClass]);
parent::DoCheckToWrite();
}