TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #500 - Handle custom related key names, don't use session keys for existing parent models

This commit is contained in:
Sam Georges 2014-08-05 18:20:25 +10:00
parent e40554574d
commit a1998e4348
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/backend/behaviors/RelationController.php
View File

@ -408,14 +408,16 @@ class RelationController extends ControllerBehavior
*/
protected function findExistingRelationIds($checkIds = null)
{
$foreignKeyName = $this->relationModel->getKey();
$results = $this->relationObject
->getBaseQuery()
->select('id');
->select($foreignKeyName);
if ($checkIds !== null && is_array($checkIds) && count($checkIds))
$results = $results->whereIn('id', $checkIds);
$results = $results->whereIn($foreignKeyName, $checkIds);
return $results->lists('id');
return $results->lists($foreignKeyName);
}
//
@ -494,10 +496,15 @@ class RelationController extends ControllerBehavior
*/
$existingIds = $this->findExistingRelationIds($checkedIds);
$checkedIds = array_diff($checkedIds, $existingIds);
$foreignKeyName = $this->relationModel->getKey();
$models = $this->relationModel->whereIn('id', $checkedIds)->get();
$models = $this->relationModel->whereIn($foreignKeyName, $checkedIds)->get();
foreach ($models as $model) {
$this->relationObject->add($model, $this->relationGetSessionKey());
if ($this->model->exists)
$this->relationObject->add($model);
else
$this->relationObject->add($model, $this->relationGetSessionKey());
}
}
@ -540,7 +547,8 @@ class RelationController extends ControllerBehavior
/*
* Check for existing relation
*/
$existing = $this->relationObject->where('id', $foreignId)->count();
$foreignKeyName = $this->relationModel->getKey();
$existing = $this->relationObject->where($foreignKeyName, $foreignId)->count();
if (!$existing)
$this->relationObject->add($foreignModel, null, $saveData);