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

Merged from branches/2.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77817 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-26 02:19:50 +00:00
parent b8ce07f459
commit 60c5570bf8
2 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
forms/ComplexTableField.php
View File

@ -434,9 +434,10 @@ JS;
$relations = singleton($parentClass)->$relation(); $relations = singleton($parentClass)->$relation();
$classes = ClassInfo::ancestry($childClass); $classes = ClassInfo::ancestry($childClass);
if($relations) {
foreach($relations as $k => $v) { foreach($relations as $k => $v) {
if( $v == $childClass ) if(array_key_exists($v, $classes)) return $k . 'ID';
return $k . 'ID'; }
} }
return false; return false;
} }
@ -952,9 +953,11 @@ class ComplexTableField_ItemRequest extends RequestHandler {
$relations = singleton($parentClass)->$relation(); $relations = singleton($parentClass)->$relation();
$classes = ClassInfo::ancestry($childClass); $classes = ClassInfo::ancestry($childClass);
if($relations) {
foreach($relations as $k => $v) { foreach($relations as $k => $v) {
if(array_key_exists($v, $classes)) return $k . 'ID'; if(array_key_exists($v, $classes)) return $k . 'ID';
} }
}
return false; return false;
} }

40
tests/forms/ComplexTableFieldTest.php
View File

@ -15,14 +15,6 @@ class ComplexTableFieldTest extends FunctionalTest {
*/ */
protected $controller; protected $controller;
/**
* An instance of {@link Form} that is taken
* from the test controller, used for testing.
*
* @var Form object
*/
protected $form;
function setUp() { function setUp() {
parent::setUp(); parent::setUp();
@ -34,10 +26,7 @@ class ComplexTableFieldTest extends FunctionalTest {
$field = $this->manyManyForm->dataFieldByName('Players'); $field = $this->manyManyForm->dataFieldByName('Players');
$parser = new CSSContentParser($field->FieldHolder()); $parser = new CSSContentParser($field->FieldHolder());
/* There are 2 players (rows) in the table */
$this->assertEquals(count($parser->getBySelector('tbody tr')), 2, 'There are 2 players (rows) in the table'); $this->assertEquals(count($parser->getBySelector('tbody tr')), 2, 'There are 2 players (rows) in the table');
/* There are 2 CTF items in the DataObjectSet */
$this->assertEquals($field->Items()->Count(), 2, 'There are 2 CTF items in the DataObjectSet'); $this->assertEquals($field->Items()->Count(), 2, 'There are 2 CTF items in the DataObjectSet');
} }
@ -54,16 +43,9 @@ class ComplexTableFieldTest extends FunctionalTest {
) )
)); ));
/* Retrieve the new player record we created */
$newPlayer = DataObject::get_one('ComplexTableFieldTest_Player', "Name = 'Bobby Joe'"); $newPlayer = DataObject::get_one('ComplexTableFieldTest_Player', "Name = 'Bobby Joe'");
/* A new ComplexTableFieldTest_Player record was created, Name = "Bobby Joe" */
$this->assertNotNull($newPlayer, 'A new ComplexTableFieldTest_Player record was created, Name = "Bobby Joe"'); $this->assertNotNull($newPlayer, 'A new ComplexTableFieldTest_Player record was created, Name = "Bobby Joe"');
/* Get the many-many related Teams to the new player that were automatically linked by CTF */
$teams = $newPlayer->getManyManyComponents('Teams'); $teams = $newPlayer->getManyManyComponents('Teams');
/* Automatic many-many relation was set correctly on the new player */
$this->assertEquals($teams->Count(), 1, 'Automatic many-many relation was set correctly on the new player'); $this->assertEquals($teams->Count(), 1, 'Automatic many-many relation was set correctly on the new player');
} }
@ -80,26 +62,16 @@ class ComplexTableFieldTest extends FunctionalTest {
) )
)); ));
/* Retrieve the new sponsor record we created */
$newSponsor = DataObject::get_one('ComplexTableFieldTest_Sponsor', "Name = 'Jim Beam'"); $newSponsor = DataObject::get_one('ComplexTableFieldTest_Sponsor', "Name = 'Jim Beam'");
/* A new ComplexTableFieldTest_Sponsor record was created, Name = "Jim Beam" */
$this->assertNotNull($newSponsor, 'A new ComplexTableFieldTest_Sponsor record was created, Name = "Jim Beam"'); $this->assertNotNull($newSponsor, 'A new ComplexTableFieldTest_Sponsor record was created, Name = "Jim Beam"');
$this->assertEquals($newSponsor->TeamID, $team->ID, 'Automatic has-many/has-one relation was set correctly on the sponsor');
$this->assertEquals($newSponsor->getComponent('Team')->ID, $team->ID, 'Automatic has-many/has-one relation was set correctly on the sponsor');
/* Get the has-one related Team to the new sponsor that were automatically linked by CTF */ $team = DataObject::get_by_id('ComplexTableFieldTest_Team', $team->ID);
$teamID = $newSponsor->TeamID; $sponsor = DataObject::get_by_id('ComplexTableFieldTest_Sponsor', $newSponsor->ID);
/* Automatic many-many relation was set correctly on the new player */
$this->assertTrue($teamID > 0, 'Automatic has-many/has-one relation was set correctly on the sponsor');
/* The other side of the relation works as well */
$team = DataObject::get_by_id('ComplexTableFieldTest_Team', $teamID);
/* Let's get the Sponsors component */
$sponsor = $team->getComponents('Sponsors')->First();
/* The sponsor is the same as the one we added */
$this->assertEquals($newSponsor->ID, $sponsor->ID, 'The sponsor is the same as the one we added'); $this->assertEquals($newSponsor->ID, $sponsor->ID, 'The sponsor is the same as the one we added');
$foundTeam = $sponsor->getComponent('Team');
$this->assertEquals($team->ID, $foundTeam->ID, 'The team ID matches on the other side of the relation');
} }
} }