ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-03 06:55:03 +03:00
Code Issues Releases Wiki Activity

fix ORM: retrieve relation data

Browse source
This commit is contained in:
Mzhelskiy Maxim 2011-03-28 12:53:49 +00:00
parent 9c88bdcc41
commit e7be71f376
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/classes/EntityORM.class.php
View file

@ -331,12 +331,12 @@ abstract class EntityORM extends Entity {
$aCmdArgs=array(); $aCmdArgs=array();
switch ($sRelationType) { switch ($sRelationType) {
case self::RELATION_TYPE_BELONGS_TO : case self::RELATION_TYPE_BELONGS_TO :
$sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ByFilter"; $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}By".func_camelize($sRelPrimaryKey);
$aCmdArgs[0]=array($sRelPrimaryKey => $this->_getDataOne($sRelationKey)); $aCmdArgs[0]=$this->_getDataOne($sRelationKey);
break; break;
case self::RELATION_TYPE_HAS_ONE : case self::RELATION_TYPE_HAS_ONE :
$sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ByFilter"; $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}By".func_camelize($sRelationKey);
$aCmdArgs[0]=array($sRelationKey => $iPrimaryKeyValue); $aCmdArgs[0]=$iPrimaryKeyValue;
break; break;
case self::RELATION_TYPE_HAS_MANY : case self::RELATION_TYPE_HAS_MANY :
$sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ItemsByFilter"; $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ItemsByFilter";
@ -354,7 +354,7 @@ abstract class EntityORM extends Entity {
default: default:
break; break;
} }
if(array_key_exists(0,$aArgs) && is_array($aArgs[0])) { if(is_array($aCmdArgs[0]) && array_key_exists(0,$aArgs) && is_array($aArgs[0])) {
$aCmdArgs[0] = array_merge($aCmdArgs[0], $aArgs[0]); $aCmdArgs[0] = array_merge($aCmdArgs[0], $aArgs[0]);
} }
$res=Engine::GetInstance()->_CallModule($sCmd,$aCmdArgs); $res=Engine::GetInstance()->_CallModule($sCmd,$aCmdArgs);