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

- Use the new HierarchicalKeys for Organization and Locations and use the hierarchy of organization for the profiles/user rights.

Browse Source 
SVN:trunk[1382]
This commit is contained in:
Denis Flaven
2011-07-28 15:14:49 +00:00
parent d50f812694
commit c85feb7cea
7 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
addons/userrights/userrightsprofile.class.inc.php
View File

@@ -780,8 +780,6 @@ exit;
// All of them are visible
return true;
}
$oExpression = new FieldExpression($sAttCode, $sClass);
// Position the user
//
@$aUserOrgs = $this->m_aUserOrgs[$oUser->GetKey()];
@@ -791,12 +789,52 @@ exit;
return true;
}
$oExpression = new FieldExpression($sAttCode, $sClass);
$oFilter = new DBObjectSearch($sClass);
$aIds = array_keys($aUserOrgs);
$oListExpr = ListExpression::FromScalars($aIds);
$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
$oFilter = new DBObjectSearch($sClass);
$oFilter->AddConditionExpression($oCondition);
// Check if the condition points to a hierarchical key
if ($sAttCode == 'id')
{
// Filtering on the objects themselves
$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sClass);
if ($sHierarchicalKeyCode !== false)
{
$oRootFilter = new DBObjectSearch($sClass);
$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
$oRootFilter->AddConditionExpression($oCondition);
$oFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
$bConditionAdded = true;
}
}
else
{
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
$bConditionAdded = false;
if ($oAttDef->IsExternalKey())
{
$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
if ($sHierarchicalKeyCode !== false)
{
$oRootFilter = new DBObjectSearch($oAttDef->GetTargetClass());
$oExpression = new FieldExpression('id', $oAttDef->GetTargetClass());
$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
$oRootFilter->AddConditionExpression($oCondition);
$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
$oHKFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
$oFilter->AddCondition_PointingTo($oHKFilter, $sAttCode);
$bConditionAdded = true;
}
}
}
if (!$bConditionAdded)
{
$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
$oFilter->AddConditionExpression($oCondition);
}
return $oFilter;
}