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

Merge branch 'hotfix/N1963'

Browse Source
This commit is contained in:
Eric
2019-02-13 11:01:39 +01:00
parent 90e128f951 f83292fccc
commit 8f434cad08
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
application/dashlet.class.inc.php
View File

@@ -444,44 +444,40 @@ EOF
$sClass = $oQuery->GetClass(); $sClass = $oQuery->GetClass();
foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType) foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
{ {
if ($sAttType == 'AttributeLinkedSet') if (is_a($sAttType, 'AttributeLinkedSet', true))
{ {
continue; continue;
} }
if (is_subclass_of($sAttType, 'AttributeLinkedSet')) if (is_a($sAttType, 'AttributeFriendlyName', true))
{ {
continue; continue;
} }
if ($sAttType == 'AttributeFriendlyName') if (is_a($sAttType, 'AttributeOneWayPassword', true))
{ {
continue; continue;
} }
if (is_subclass_of($sAttType, 'AttributeFriendlyName')) // For external fields, find the real type of the target
while (is_a($sAttType, 'AttributeExternalField', true))
{ {
continue; $sExtKeyAttCode = $this->oModelReflection->GetAttributeProperty($sClass, $sAttCode, 'extkey_attcode');
} $sTargetClass = $this->oModelReflection->GetAttributeProperty($sClass, $sExtKeyAttCode, 'targetclass');
if ($sAttType == 'AttributeExternalField') $sTargetAttCode = $this->oModelReflection->GetAttributeProperty($sClass, $sAttCode, 'target_attcode');
{ $aTargetAttCodes = $this->oModelReflection->ListAttributes($sTargetClass);
continue; $sAttType = $aTargetAttCodes[$sTargetAttCode];
}
if (is_subclass_of($sAttType, 'AttributeExternalField'))
{
continue;
}
if ($sAttType == 'AttributeOneWayPassword')
{
continue;
} }
$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode); $sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
$aGroupBy[$sAttCode] = $sLabel; if (!in_array($sLabel, $aGroupBy))
if (is_subclass_of($sAttType, 'AttributeDateTime') || $sAttType == 'AttributeDateTime')
{ {
$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel); $aGroupBy[$sAttCode] = $sLabel;
$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel); if (is_a($sAttType, 'AttributeDateTime', true))
$aGroupBy[$sAttCode.':day_of_month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth', $sLabel); {
$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel);
$aGroupBy[$sAttCode.':day_of_month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth', $sLabel);
}
} }
} }
asort($aGroupBy); asort($aGroupBy);