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

Portal : Fixed a regression introduced by r4324 causing HTML entities on the browse brick.

Browse Source 
SVN:trunk[4353]
This commit is contained in:
Guillaume Lajarige
2016-08-29 07:27:29 +00:00
parent b357e7d7d6
commit c5957f1146
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
View File

@@ -545,7 +545,7 @@ class BrowseBrickController extends BrickController
$aRow[$key] = array( $aRow[$key] = array(
'level_alias' => $key, 'level_alias' => $key,
'id' => $value->GetKey(), 'id' => $value->GetKey(),
'name' => $value->GetAsHTML($aLevelsProperties[$key]['name_att']), 'name' => $value->Get($aLevelsProperties[$key]['name_att']),
'class' => get_class($value), 'class' => get_class($value),
'action_rules_token' => static::PrepareActionRulesForItem($value, $key, $aLevelsProperties) 'action_rules_token' => static::PrepareActionRulesForItem($value, $key, $aLevelsProperties)
); );
@@ -561,7 +561,7 @@ class BrowseBrickController extends BrickController
$aRow[$key]['fields'] = array(); $aRow[$key]['fields'] = array();
foreach ($aLevelsProperties[$key]['fields'] as $aField) foreach ($aLevelsProperties[$key]['fields'] as $aField)
{ {
$aRow[$key]['fields'][$aField['code']] = $value->GetAsHTML($aField['code']); $aRow[$key]['fields'][$aField['code']] = $value->Get($aField['code']);
} }
} }
} }
@@ -610,7 +610,7 @@ class BrowseBrickController extends BrickController
$aItems[$sCurrentIndex] = array( $aItems[$sCurrentIndex] = array(
'level_alias' => $aCurrentRowKeys[0], 'level_alias' => $aCurrentRowKeys[0],
'id' => $aCurrentRowValues[0]->GetKey(), 'id' => $aCurrentRowValues[0]->GetKey(),
'name' => $aCurrentRowValues[0]->GetAsHTML($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']), 'name' => $aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']),
'class' => get_class($aCurrentRowValues[0]), 'class' => get_class($aCurrentRowValues[0]),
'subitems' => array(), 'subitems' => array(),
'action_rules_token' => static::PrepareActionRulesForItem($aCurrentRowValues[0], $aCurrentRowKeys[0], $aLevelsProperties) 'action_rules_token' => static::PrepareActionRulesForItem($aCurrentRowValues[0], $aCurrentRowKeys[0], $aLevelsProperties)

2
datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
View File

@@ -389,7 +389,7 @@ class ManageBrickController extends BrickController
} }
else else
{ {
$sValue = $oCurrentRow->GetAsHTML($sItemAttr); $sValue = $oCurrentRow->Get($sItemAttr);
} }
unset($oAttDef); unset($oAttDef);