tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Stricter checking that a relation exists on ComplexTableField::saveComplexTableField() (from r106755)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112536 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-15 03:03:54 +00:00
parent 0acb21d219
commit a1f9efc414
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/ComplexTableField.php
View File

@ -650,16 +650,16 @@ JS;
if(isset($data['ctf']['manyManyRelation'])) { if(isset($data['ctf']['manyManyRelation'])) {
$parentRecord = DataObject::get_by_id($data['ctf']['parentClass'], (int) $data['ctf']['sourceID']); $parentRecord = DataObject::get_by_id($data['ctf']['parentClass'], (int) $data['ctf']['sourceID']);
$relationName = $data['ctf']['manyManyRelation']; $relationName = $data['ctf']['manyManyRelation'];
$componentSet = $parentRecord->getManyManyComponents($relationName); $componentSet = $parentRecord ? $parentRecord->getManyManyComponents($relationName) : null;
$componentSet->add($childData); if($componentSet) $componentSet->add($childData);
} }
if(isset($data['ctf']['hasManyRelation'])) { if(isset($data['ctf']['hasManyRelation'])) {
$parentRecord = DataObject::get_by_id($data['ctf']['parentClass'], (int) $data['ctf']['sourceID']); $parentRecord = DataObject::get_by_id($data['ctf']['parentClass'], (int) $data['ctf']['sourceID']);
$relationName = $data['ctf']['hasManyRelation']; $relationName = $data['ctf']['hasManyRelation'];
$componentSet = $parentRecord->getComponents($relationName); $componentSet = $parentRecord ? $parentRecord->getComponents($relationName) : null;
$componentSet->add($childData); if($componentSet) $componentSet->add($childData);
} }
$referrer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null; $referrer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;