mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77066 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
2fc1771f93
commit
619c570801
@ -1242,7 +1242,7 @@ class TableListField_Item extends ViewableData {
|
|||||||
|
|
||||||
// This supports simple FieldName syntax
|
// This supports simple FieldName syntax
|
||||||
if(strpos($fieldName,'.') === false) {
|
if(strpos($fieldName,'.') === false) {
|
||||||
$value = ($this->item->val($fieldName)) ? $this->item->val($fieldName) : $this->item->$fieldName;
|
$value = ($this->item->XML_val($fieldName)) ? $this->item->XML_val($fieldName) : $this->item->$fieldName;
|
||||||
// This support the syntax fieldName = Relation.RelatedField
|
// This support the syntax fieldName = Relation.RelatedField
|
||||||
} else {
|
} else {
|
||||||
$fieldNameParts = explode('.', $fieldName) ;
|
$fieldNameParts = explode('.', $fieldName) ;
|
||||||
@ -1257,6 +1257,7 @@ class TableListField_Item extends ViewableData {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// casting
|
// casting
|
||||||
if(array_key_exists($fieldName, $this->parent->fieldCasting)) {
|
if(array_key_exists($fieldName, $this->parent->fieldCasting)) {
|
||||||
$value = $this->parent->getCastedValue($value, $this->parent->fieldCasting[$fieldName]);
|
$value = $this->parent->getCastedValue($value, $this->parent->fieldCasting[$fieldName]);
|
||||||
@ -1278,6 +1279,7 @@ class TableListField_Item extends ViewableData {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$fields[] = new ArrayData(array(
|
$fields[] = new ArrayData(array(
|
||||||
"Name" => $fieldName,
|
"Name" => $fieldName,
|
||||||
"Title" => $fieldTitle,
|
"Title" => $fieldTitle,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user