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

MINOR: Use FieldList over deprecated FieldSet

Browse Source
This commit is contained in:
Sam Minnee 2011-10-29 17:09:12 +13:00
parent 22e5617ee2
commit 42b8d3da04
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forms/FieldGroup.php
View File

@ -71,7 +71,7 @@ class FieldGroup extends CompositeField {
*/ */
function Name(){ function Name(){
if(!$this->title) { if(!$this->title) {
$fs = $this->FieldSet(); $fs = $this->FieldList();
$compositeTitle = ''; $compositeTitle = '';
$count = 0; $count = 0;
foreach($fs as $subfield){ foreach($fs as $subfield){
@ -93,7 +93,7 @@ class FieldGroup extends CompositeField {
* it is easier to overwrite the <div class="field"> behaviour in a more specific class * it is easier to overwrite the <div class="field"> behaviour in a more specific class
*/ */
function Field() { function Field() {
$fs = $this->FieldSet(); $fs = $this->FieldList();
$spaceZebra = isset($this->zebra) ? " fieldgroup-$this->zebra" : ''; $spaceZebra = isset($this->zebra) ? " fieldgroup-$this->zebra" : '';
$idAtt = isset($this->id) ? " id=\"{$this->id}\"" : ''; $idAtt = isset($this->id) ? " id=\"{$this->id}\"" : '';
$content = "<div class=\"fieldgroup$spaceZebra\"$idAtt>"; $content = "<div class=\"fieldgroup$spaceZebra\"$idAtt>";
@ -143,7 +143,7 @@ HTML;
} }
function Message() { function Message() {
$fs = $this->FieldSet(); $fs = $this->FieldList();
foreach($fs as $subfield) { foreach($fs as $subfield) {
if($m = $subfield->Message()) $message[] = $m; if($m = $subfield->Message()) $message[] = $m;
} }
@ -151,7 +151,7 @@ HTML;
} }
function MessageType(){ function MessageType(){
$fs = $this->FieldSet(); $fs = $this->FieldList();
foreach($fs as $subfield) { foreach($fs as $subfield) {
if($m = $subfield->MessageType()) $MessageType[] = $m; if($m = $subfield->MessageType()) $MessageType[] = $m;
} }
@ -164,7 +164,7 @@ HTML;
* This allows fields within this fieldgroup to still allow them to get valuated. * This allows fields within this fieldgroup to still allow them to get valuated.
*/ */
function jsValidation(){ function jsValidation(){
$fs = $this->FieldSet(); $fs = $this->FieldList();
$validationCode = ''; $validationCode = '';
foreach($fs as $subfield) { foreach($fs as $subfield) {

2
model/DataObject.php
View File

@ -1847,7 +1847,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/** /**
* Centerpiece of every data administration interface in Silverstripe, * Centerpiece of every data administration interface in Silverstripe,
* which returns a {@link FieldSet} suitable for a {@link Form} object. * which returns a {@link FieldList} suitable for a {@link Form} object.
* If not overloaded, we're using {@link scaffoldFormFields()} to automatically * If not overloaded, we're using {@link scaffoldFormFields()} to automatically
* generate this set. To customize, overload this method in a subclass * generate this set. To customize, overload this method in a subclass
* or extended onto it by using {@link DataExtension->updateCMSFields()}. * or extended onto it by using {@link DataExtension->updateCMSFields()}.