소스 검색

- Bug fix: the hierarchical key in Organizations is not always named 'parent_id' !

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1869 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 년 전
부모
커밋
f4a61b995e
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      addons/userrights/userrightsprofile.class.inc.php

+ 1 - 1
addons/userrights/userrightsprofile.class.inc.php

@@ -693,7 +693,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
 		$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
 		if ($sHierarchicalKeyCode !== false)
 		if ($sHierarchicalKeyCode !== false)
 		{
 		{
-			$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.parent_id BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id';
+			$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id';
 			$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery));
 			$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery));
 			while ($aRow = $oUserOrgSet->FetchAssoc())
 			while ($aRow = $oUserOrgSet->FetchAssoc())
 			{
 			{