composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 14:38:47 +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

15
core/attributedef.class.inc.php
View File

@@ -2431,9 +2431,10 @@ class AttributeHierarchicalKey extends AttributeExternalKey
static protected function ListExpectedParams()
{
$aParams = parent::ListExpectedParams();
//unset($aParams[array_search('targetclass', $aParams)]);
//print_r($aParams);
$idx = array_search('targetclass', $aParams);
unset($aParams[$idx]);
$idx = array_search('jointype', $aParams);
unset($aParams[$idx]);
return $aParams; // TODO: mettre les bons parametres ici !!
}
@@ -2444,9 +2445,9 @@ class AttributeHierarchicalKey extends AttributeExternalKey
}
public function IsHierarchicalKey() {return true;}
public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->GetHostClass();}
public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
public function GetKeyAttCode() {return $this->GetCode();}
public function GetKeyAttCode() {return $this->GetCode();}
public function GetBasicFilterOperators()
{
@@ -2637,8 +2638,8 @@ class AttributeExternalField extends AttributeDefinition
public function GetExtAttDef()
{
$oKeyAttDef = $this->GetKeyAttDef();
$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->Get("targetclass"), $this->Get("target_attcode"));
if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->Get("targetclass")." has no attribute ".$this->Get("target_attcode"));
$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $this->Get("target_attcode"));
if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->GetTargetClass()." has no attribute ".$this->Get("target_attcode"));
return $oExtAttDef;
}