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

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	application/displayblock.class.inc.php
#	js/search/search_form_criteria_enum.js
#	test/core/ormLinkSetTest.php
This commit is contained in:
Stephen Abello
2021-12-02 10:04:04 +01:00
parent 2722f305e0 dfd1d5fe35
commit 18e341b0b7
4 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/spreadsheetbulkexport.class.inc.php
View File

@@ -354,7 +354,7 @@ EOF
}
else if ($oAttDef instanceof AttributeTagSet)
{
$sField = $oObj->GetAsCSV($sAttCode, $this->bLocalizeOutput, '');
$sField = utils::HtmlEntities($oObj->GetAsCSV($sAttCode, $this->bLocalizeOutput, ''));
$sData .= "<td x:str>$sField</td>";
}
else

2
js/search/search_form_criteria_enum.js
View File

@@ -922,7 +922,7 @@ $(function()
// - Make a jQuery element for a list item
_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden,bObsolete, sAdditionalField)
{
var sEscapedLabel = sLabel; // Note: We don't escape this anymore as there is an issue with AttributeExternalKey being already escaped. This will be put back in iTop 2.7 with the AttributeDefinition::GetAllowedValues() refactoring. $('<div />').text(sLabel).html();
var sEscapedLabel = $('<div />').text(sLabel).html();
if (bObsolete == 1) {
sEscapedLabel = '<span class="object-ref-icon text_decoration"><span class="fas fa-eye-slash object-obsolete fa-1x fa-fw"></span></span>'+sEscapedLabel;
}

2
js/search/search_form_criteria_raw.js
View File

@@ -72,7 +72,7 @@ $(function()
{
if(sTitle === undefined)
{
sTitle = this.options.label;
sTitle = $('<div/>').text(this.options.label).html();
}
return this._super(sTitle);

99
test/core/ormLinkSetTest.php
View File

@@ -308,4 +308,103 @@ class ormLinkSetTest extends ItopDataTestCase
];
}
/**
* don't work cf bug N°4402
* @throws Exception
*/
/*public function testListPreviousValuesForUpdatedAttributes_AttributeLinkedSetIndirect()
{
$oServer = $this->CreateServer(1);
$oPerson = $this->CreatePerson(0);
$this->AddContactToCI($oPerson, $oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oPerson = $this->CreatePerson(1);
$this->AddContactToCI($oPerson, $oServer);
$oServer->DBUpdate();
$oSetOldFcisList = $oServer->ListPreviousValuesForUpdatedAttributes()['contacts_list']->ToDBObjectSet();
static::assertEquals(1, $oSetOldFcisList->Count());
}*/
/**
* @throws Exception
*/
public function testListPreviousValuesForUpdatedAttributes_AttributeString()
{
$oServer = $this->CreateServer(1);
$oServer->Set('serialnumber', 'my serialnumber');
$oServer->DBUpdate();
static::assertEquals('', $oServer->ListPreviousValuesForUpdatedAttributes()['serialnumber']);
$this->ReloadObject($oServer);
$oServer->Set('serialnumber', 'my serialnumber2');
$oServer->DBUpdate();
static::assertEquals('my serialnumber', $oServer->ListPreviousValuesForUpdatedAttributes()['serialnumber']);
}
/**
* @throws Exception
*/
public function testListPreviousValuesForUpdatedAttributes_AttributeExternalKey()
{
$oServer = $this->CreateServer(1);
$idOrgInit = $oServer->Get('org_id');
$oOrganization = $this->CreateOrganization(1);
$oServer->Set('org_id',$oOrganization);
$oServer->DBUpdate();
static::assertEquals($idOrgInit, $oServer->ListPreviousValuesForUpdatedAttributes()['org_id']);
static::assertNotEquals($oOrganization->GetKey(), $oServer->ListPreviousValuesForUpdatedAttributes()['org_id']);
static::assertEquals($oOrganization->GetKey(), $oServer->Get('org_id'));
}
/**
* don't work cf bug N°4402
* @throws Exception
*/
/*public function testListPreviousValuesForUpdatedAttributes_AttributeExternalField()
{
$oServer = $this->CreateServer(1);
$OrgInit = $oServer->Get('organization_name');
$oOrganization = $this->CreateOrganization('Serv1');
$oServer->Set('org_id',$oOrganization);
$oServer->DBUpdate();
//static::assertEquals($OrgInit, json_encode($oServer->ListPreviousValuesForUpdatedAttributes()));
static::assertEquals($OrgInit, $oServer->ListPreviousValuesForUpdatedAttributes()['organization_name']);
static::assertNotEquals($oOrganization->Get('name'), $oServer->ListPreviousValuesForUpdatedAttributes()['organization_name']);
static::assertEquals($oOrganization->Get('name'), $oServer->Get('organization_name'));
}*/
/**
* don't work cf bug N°4402
* @throws Exception
*/
/*public function testListPreviousValuesForUpdatedAttributes_AttributeLinkedSet()
{
$oServer = $this->CreateServer(1);
$oPhysicalInterface = $this->CreatePhysicalInterface(1, 1000, $oServer->GetKey());
$this->debug("Created PhysicalInterface {$oPhysicalInterface->GetName()} ({$oPhysicalInterface->GetKey()})");
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$this->debug("Nb PhysicalInterface".$oServer->Get('physicalinterface_list')->Count());
$oPhysicalInterface2 = $this->CreatePhysicalInterface(2, 1000, $oServer->GetKey());
$this->debug("Created PhysicalInterface {$oPhysicalInterface2->GetName()} ({$oPhysicalInterface2->GetKey()})");
$oServer->DBUpdate();
$oSetOldFcisList=$oServer->Get('physicalinterface_list')->ToDBObjectSet();
while ($oObject = $oSetOldFcisList->Fetch())
{
$this->debug("PI: ".get_class($oObject).": ".$oObject->GetKey());
}
$this->debug("Nb PhysicalInterface".$oServer->Get('physicalinterface_list')->Count());
//$oSetOldFcisList = $oServer->ListPreviousValuesForUpdatedAttributes()['physicalinterface_list']->ToDBObjectSet();
static::assertEquals(1, $oSetOldFcisList->Count());
}*/
}