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

N°931: TagSetData table name

Browse Source
This commit is contained in:
Eric
2018-09-19 16:07:10 +02:00
parent 055d2cc62c
commit 0252d091ca
7 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/ItopDataTestCase.php
View File

@@ -38,6 +38,7 @@ use lnkContactToFunctionalCI;
use MetaModel;
use Person;
use Server;
use TagSetFieldData;
use Ticket;
use URP_UserProfile;
use VirtualHost;
@@ -223,7 +224,7 @@ class ItopDataTestCase extends ItopTestCase
*/
protected function CreateTagData($sClass, $sAttCode, $sTagCode, $sTagLabel, $sTagDescription = '')
{
$sTagClass = MetaModel::GetTagDataClass($sClass, $sAttCode);
$sTagClass = TagSetFieldData::GetTagDataClassName($sClass, $sAttCode);
$oTagData = $this->createObject($sTagClass, array(
'tag_code' => $sTagCode,
'tag_label' => $sTagLabel,
@@ -248,7 +249,7 @@ class ItopDataTestCase extends ItopTestCase
*/
protected function RemoveTagData($sClass, $sAttCode, $sTagCode)
{
$sTagClass = MetaModel::GetTagDataClass($sClass, $sAttCode);
$sTagClass = TagSetFieldData::GetTagDataClassName($sClass, $sAttCode);
$this->RemoveObjects($sTagClass, "SELECT $sTagClass WHERE tag_code = '$sTagCode'");
}

2
test/core/TagSetFieldDataTest.php
View File

@@ -129,7 +129,7 @@ class TagSetFieldDataTest extends ItopDataTestCase
*/
public function testComputeValues()
{
$sTagClass = \MetaModel::GetTagDataClass(TAG_CLASS, TAG_ATTCODE);
$sTagClass = TagSetFieldData::GetTagDataClassName(TAG_CLASS, TAG_ATTCODE);
$oTagData = $this->createObject($sTagClass, array(
'tag_code' => 'tag1',
'tag_label' => 'First',