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.5' into release/2.6

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
#	dictionaries/zh.dictionary.itop.ui.php
This commit is contained in:
Pierre Goiffon
2018-12-11 17:23:34 +01:00
parent afd6428411 8400eb910f
commit 45910dc115
3 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/schema.php
View File

@@ -895,7 +895,7 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
}
elseif (is_object($oAllowedValuesDef = $oAttDef->GetValuesDef()))
{
$sAllowedValues = trim( $oAllowedValuesDef->GetValuesDescription(), "Filter : ");
$sAllowedValues = str_replace("Filter: ", "", $oAllowedValuesDef->GetValuesDescription());
$sAllowedValuesEscpd = json_encode($sAllowedValues);
$sFilterURL = urlencode($sAllowedValues);