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

#415 Could not limit user on some organization (symptom: wrong queries... org_id does not exist...)

Browse Source 
SVN:trunk[1319]
This commit is contained in:
Romain Quetiez
2011-07-01 15:08:38 +00:00
parent b2c5f183ec
commit 645b02b2d1
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -751,17 +751,24 @@ exit;
// Determine how to position the objects of this class
//
$aCallSpec = array($sClass, 'MapContextParam');
if ($sClass == 'Organization')
{
$sAttCode = 'id';
}
elseif (is_callable("$sClass::MapContextParam"))
elseif (is_callable($aCallSpec))
{
$sAttCode = eval("return $sClass::MapContextParam('org_id');"); // Returns null when there is no mapping for this parameter
$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
if ($sAttCode == null)
{
return true;
}
if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
{
// Skip silently. The data model checker will tell you something about this...
return true;
}
}
elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
{

3
application/displayblock.class.inc.php
View File

@@ -331,9 +331,10 @@ class DisplayBlock
$oAppContext = new ApplicationContext();
$sClass = $this->m_oFilter->GetClass();
$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($sClass));
$aCallSpec = array($sClass, 'MapContextParam');
foreach($oAppContext->GetNames() as $sContextParam)
{
eval("\$sParamCode = $sClass::MapContextParam('$sContextParam');"); //Map context parameter to the value/filter code depending on the class
$sParamCode = call_user_func($aCallSpec, $sContextParam); //Map context parameter to the value/filter code depending on the class
if (!is_null($sParamCode))
{
$sParamValue = $oAppContext->GetCurrentValue($sContextParam, null);

7
pages/audit.php
View File

@@ -44,15 +44,16 @@ try
{
$sObjClass = $oFilter->GetClass();
$aContextParams = $oAppContext->GetNames();
if (is_callable("$sObjClass::MapContextParam"))
$aCallSpec = array($sObjClass, 'MapContextParam');
if (is_callable($aCallSpec))
{
foreach($aContextParams as $sParamName)
{
$sValue = $oAppContext->GetCurrentValue($sParamName, null);
if ($sValue != null)
{
$sAttCode = eval("return $sObjClass::MapContextParam('$sParamName');"); // Returns null when there is no mapping for this parameter
if ($sAttCode != null)
$sAttCode = call_user_func($aCallSpec, $sParamName); // Returns null when there is no mapping for this parameter
if ($sAttCode != null && MetaModel::IsValidAttCode($sObjClass, $sAttCode))
{
$oFilter->AddCondition($sAttCode, $sValue);
}