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

fixed getParentIdName() call in DetailForm() - paramter-order was wrong

Browse Source 
better checking in saveComplexTableField() to avoid PHP-notice

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47740 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-01-08 21:57:15 +00:00
parent 2a04a0a57b
commit 071b310c64
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/ComplexTableField.php
View File

@ -289,7 +289,7 @@ JS;
}
if($this->getParentClass()) {
$parentIdName = $this->getParentIdName($this->sourceClass,$this->getParentClass());
$parentIdName = $this->getParentIdName($this->getParentClass(), $this->sourceClass);
if(!$parentIdName) {
user_error("ComplexTableField::DetailForm() Cannot automatically
determine 'has-one'-relationship to parent,
@ -743,10 +743,8 @@ class ComplexTableField_Popup extends Form {
* @see {Form::ReferencedField}).
*/
function saveComplexTableField() {
$id = Convert::raw2sql($_REQUEST['ctf']['childID']);
if (is_numeric($id)) {
$childObject = DataObject::get_by_id($this->sourceClass, $id);
if(isset($_REQUEST['ctf']['childID']) && is_numeric($_REQUEST['ctf']['childID'])) {
$childObject = DataObject::get_by_id($this->sourceClass, $_REQUEST['ctf']['childID']);
} else {
$childObject = new $this->sourceClass();
$this->fields->removeByName('ID');