mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merged revisions 47413 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq ........ r47413 | ischommer | 2007-12-20 18:16:26 +1300 (Thu, 20 Dec 2007) | 1 line syntax ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52182 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
220b78454c
commit
b3f8bdc8ef
@ -1,10 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
|
||||||
* @package forms
|
|
||||||
* @subpackage fields-relational
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TableField behaves in the same manner as TableListField, however allows the addition of
|
* TableField behaves in the same manner as TableListField, however allows the addition of
|
||||||
* fields and editing of attributes specified, and filtering results.
|
* fields and editing of attributes specified, and filtering results.
|
||||||
@ -27,6 +21,7 @@
|
|||||||
* @param $sourceJoin string
|
* @param $sourceJoin string
|
||||||
*
|
*
|
||||||
* @todo We should refactor this to support a single FieldSet instead of evaluated Strings for building FormFields
|
* @todo We should refactor this to support a single FieldSet instead of evaluated Strings for building FormFields
|
||||||
|
*
|
||||||
* @package forms
|
* @package forms
|
||||||
* @subpackage fields-relational
|
* @subpackage fields-relational
|
||||||
*/
|
*/
|
||||||
@ -668,7 +663,7 @@ class TableField_Item extends TableListField_Item {
|
|||||||
$field->Name = $combinedFieldName;
|
$field->Name = $combinedFieldName;
|
||||||
$field->setValue($field->dataValue());
|
$field->setValue($field->dataValue());
|
||||||
$field->addExtraClass('col'.$i);
|
$field->addExtraClass('col'.$i);
|
||||||
$field->setForm($this->data);
|
$field->setForm($this->Parent()->getForm());
|
||||||
|
|
||||||
// transformation
|
// transformation
|
||||||
if(isset($this->parent->transformationConditions[$origFieldName])) {
|
if(isset($this->parent->transformationConditions[$origFieldName])) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user