소스 검색

N°969 Portal: ManageBrick tabs could show objects that were not supposed to be shown due to a bad OQL interpretation.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4851 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 8 년 전
부모
커밋
0969b5d0a2
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php

+ 1 - 1
datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php

@@ -173,7 +173,7 @@ class ManageBrickController extends BrickController
 			{
 				foreach ($aGroupingTabs['groups'] as $aGroup)
 				{
-				    $oConditionQuery = DBSearch::FromOQL($aGroup['condition']);
+				    $oConditionQuery = $oQuery->Intersect( DBSearch::FromOQL($aGroup['condition']) );
                     // - Restricting query to scope
                     $oScopeQuery = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oConditionQuery->GetClass(), UR_ACTION_READ);
                     if ($oScopeQuery !== null)