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

Merge pull request #4664 from patricknelson/issue-4663-tabset-returns

Browse Source 
FIX for #4663 ensuring TabSet return values are retained from parent.
This commit is contained in:
Damian Mooyman 2015-10-08 13:13:20 +13:00
commit a1e4db6a6d
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
forms/CompositeField.php
View File

@ -222,6 +222,9 @@ class CompositeField extends FormField {
return $ret; return $ret;
} }
/**
* @uses FieldList->insertAfter()
*/
public function insertAfter($insertAfter, $field) { public function insertAfter($insertAfter, $field) {
$ret = $this->children->insertAfter($insertAfter, $field); $ret = $this->children->insertAfter($insertAfter, $field);
$this->sequentialSet = null; $this->sequentialSet = null;

4
forms/FieldList.php
View File

@ -312,7 +312,7 @@ class FieldList extends ArrayList {
* Returns a named field. * Returns a named field.
* You can use dot syntax to get fields from child composite fields * You can use dot syntax to get fields from child composite fields
* *
* @todo Implement similiarly to dataFieldByName() to support nested sets - or merge with dataFields() * @todo Implement similarly to dataFieldByName() to support nested sets - or merge with dataFields()
*/ */
public function fieldByName($name) { public function fieldByName($name) {
$name = $this->rewriteTabPath($name); $name = $this->rewriteTabPath($name);
@ -356,6 +356,7 @@ class FieldList extends ArrayList {
* *
* @param string $name Name of the field to insert before * @param string $name Name of the field to insert before
* @param FormField $item The form field to insert * @param FormField $item The form field to insert
* @return FormField|false
*/ */
public function insertBefore($name, $item) { public function insertBefore($name, $item) {
// Backwards compatibility for order of arguments // Backwards compatibility for order of arguments
@ -385,6 +386,7 @@ class FieldList extends ArrayList {
* *
* @param string $name Name of the field to insert after * @param string $name Name of the field to insert after
* @param FormField $item The form field to insert * @param FormField $item The form field to insert
* @return FormField|false
*/ */
public function insertAfter($name, $item) { public function insertAfter($name, $item) {
// Backwards compatibility for order of arguments // Backwards compatibility for order of arguments

29
forms/TabSet.php
View File

@ -114,7 +114,10 @@ class TabSet extends CompositeField {
} }
/** /**
* Returns the named tab * Returns a named field.
*
* @param string $name Name of the field you want to find. Allows for dot notation.
* @return FormField|null
*/ */
public function fieldByName($name) { public function fieldByName($name) {
if(strpos($name,'.') !== false) list($name, $remainder) = explode('.',$name,2); if(strpos($name,'.') !== false) list($name, $remainder) = explode('.',$name,2);
@ -135,6 +138,8 @@ class TabSet extends CompositeField {
} }
} }
} }
return null;
} }
/** /**
@ -148,22 +153,24 @@ class TabSet extends CompositeField {
/** /**
* Inserts a field before a particular field in a FieldList. * Inserts a field before a particular field in a FieldList.
* *
* @param FormField $item The form field to insert * @param string $insertBefore Name of the field to insert before
* @param string $name Name of the field to insert before * @param FormField $field The form field to insert
* @return FormField|null
*/ */
public function insertBefore($insertBefore, $field) { public function insertBefore($insertBefore, $field) {
parent::insertBefore($insertBefore, $field);
if($field instanceof Tab) $field->setTabSet($this); if($field instanceof Tab) $field->setTabSet($this);
$this->sequentialSet = null; return parent::insertBefore($insertBefore, $field);
} }
/**
* Inserts a field after a particular field in a FieldList.
*
* @param string $insertAfter Name of the field to insert after
* @param FormField $field The form field to insert
* @return FormField|null
*/
public function insertAfter($insertAfter, $field) { public function insertAfter($insertAfter, $field) {
parent::insertAfter($insertAfter, $field);
if($field instanceof Tab) $field->setTabSet($this); if($field instanceof Tab) $field->setTabSet($this);
$this->sequentialSet = null; return parent::insertAfter($insertAfter, $field);
}
public function removeByName( $tabName, $dataFieldOnly = false ) {
parent::removeByName( $tabName, $dataFieldOnly );
} }
} }